centralized project package dependency management, Directory.Build.,p…

…rops (#282)
akkadotnet · Feb 21, 2023 · 3cc4a46 · 3cc4a46
1 parent 50b4b8f
commit 3cc4a46
Show file tree

Hide file tree

Showing 9 changed files with 54 additions and 77 deletions.
diff --git a/NuGet.Config b/NuGet.Config
@@ -1,8 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
+
   <packageSources>
-    <clear />
-    <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
-    <add key="akka-nightly" value="https://www.myget.org/F/akkadotnet/api/v3/index.json" />
+    <clear/>
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
   </packageSources>
+
+<packageSourceMapping>
+  <!-- key value for <packageSource> should match key values from <packageSources> element -->
+  <packageSource key="nuget.org">
+    <package pattern="*" />
+  </packageSource>
+</packageSourceMapping>
+
 </configuration>
diff --git a/build-system/azure-pipeline.template.yaml b/build-system/azure-pipeline.template.yaml
@@ -16,6 +16,10 @@ jobs:
         submodules: recursive  # set to 'true' for a single level of submodules or 'recursive' to get submodules of submodules
         persistCredentials: true
       # Linux or macOS
+      - task: UseDotNet@2
+        displayName: 'Use .NET 6'
+        inputs:
+          version: '6.x'
       - task: Bash@3 
         displayName: Linux / OSX Build
         inputs:

diff --git a/build.fsx b/build.fsx
@@ -57,8 +57,8 @@ Target "Clean" (fun _ ->
 )
 
 Target "AssemblyInfo" (fun _ ->
-    XmlPokeInnerText "./src/common.props" "//Project/PropertyGroup/VersionPrefix" releaseNotes.AssemblyVersion    
-    XmlPokeInnerText "./src/common.props" "//Project/PropertyGroup/PackageReleaseNotes" (releaseNotes.Notes |> String.concat "\n")
+    XmlPokeInnerText "./src/Directory.Build.props" "//Project/PropertyGroup/VersionPrefix" releaseNotes.AssemblyVersion    
+    XmlPokeInnerText "./src/Directory.Build.props" "//Project/PropertyGroup/PackageReleaseNotes" (releaseNotes.Notes |> String.concat "\n")
 )
 
 Target "Build" (fun _ ->          

diff --git a/build.ps1 b/build.ps1
@@ -46,50 +46,6 @@ if (!(Test-Path $ToolPath)) {
     New-Item -Path $ToolPath -Type directory | out-null
 }
 
-###########################################################################
-# INSTALL .NET CORE CLI
-###########################################################################
-
-Function Remove-PathVariable([string]$VariableToRemove)
-{
-    $path = [Environment]::GetEnvironmentVariable("PATH", "User")
-    if ($path -ne $null)
-    {
-        $newItems = $path.Split(';', [StringSplitOptions]::RemoveEmptyEntries) | Where-Object { "$($_)" -inotlike $VariableToRemove }
-        [Environment]::SetEnvironmentVariable("PATH", [System.String]::Join(';', $newItems), "User")
-    }
-
-    $path = [Environment]::GetEnvironmentVariable("PATH", "Process")
-    if ($path -ne $null)
-    {
-        $newItems = $path.Split(';', [StringSplitOptions]::RemoveEmptyEntries) | Where-Object { "$($_)" -inotlike $VariableToRemove }
-        [Environment]::SetEnvironmentVariable("PATH", [System.String]::Join(';', $newItems), "Process")
-    }
-}
-
-# Get .NET Core CLI path if installed.
-$FoundDotNetCliVersion = $null;
-if (Get-Command dotnet -ErrorAction SilentlyContinue) {
-    $FoundDotNetCliVersion = dotnet --version;
-    $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
-    $env:DOTNET_CLI_TELEMETRY_OPTOUT=1
-}
-
-if($FoundDotNetCliVersion -ne $DotNetVersion) {
-    $InstallPath = Join-Path $PSScriptRoot ".dotnet"
-    if (!(Test-Path $InstallPath)) {
-        mkdir -Force $InstallPath | Out-Null;
-    }
-    (New-Object System.Net.WebClient).DownloadFile($DotNetInstallerUri, "$InstallPath\dotnet-install.ps1");
-    & $InstallPath\dotnet-install.ps1 -Channel $DotNetChannel -Version $DotNetVersion -InstallDir $InstallPath -Architecture x64;
-
-    Remove-PathVariable "$InstallPath"
-    $env:PATH = "$InstallPath;$env:PATH"
-    $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
-    $env:DOTNET_CLI_TELEMETRY_OPTOUT=1
-    $env:DOTNET_ROOT=$InstallPath
-}
-
 ###########################################################################
 # INSTALL NUGET
 ###########################################################################

diff --git a/build.sh b/build.sh
@@ -42,22 +42,6 @@ if [ ! -d "$TOOLS_DIR" ]; then
   mkdir "$TOOLS_DIR"
 fi
 
-###########################################################################
-# INSTALL .NET CORE CLI
-###########################################################################
-
-echo "Installing .NET CLI..."
-if [ ! -d "$SCRIPT_DIR/.dotnet" ]; then
-  mkdir "$SCRIPT_DIR/.dotnet"
-fi
-curl -Lsfo "$SCRIPT_DIR/.dotnet/dotnet-install.sh" $DOTNET_INSTALLER_URL
-bash "$SCRIPT_DIR/.dotnet/dotnet-install.sh" --version $DOTNET_VERSION --channel $DOTNET_CHANNEL --install-dir .dotnet --no-path
-export PATH="$SCRIPT_DIR/.dotnet":$PATH
-export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
-export DOTNET_CLI_TELEMETRY_OPTOUT=1
-chmod -R 0755 ".dotnet"
-"$SCRIPT_DIR/.dotnet/dotnet" --info
-
 
 ###########################################################################
 # INSTALL NUGET

diff --git a/src/Akka.Persistence.SqlServer.Tests/Akka.Persistence.SqlServer.Tests.csproj b/src/Akka.Persistence.SqlServer.Tests/Akka.Persistence.SqlServer.Tests.csproj
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-    <Import Project="..\common.props"/>
     <PropertyGroup Condition="'$(OS)' == 'Windows_NT'">
         <TargetFrameworks>$(NetFrameworkTestVersion);$(NetCoreTestVersion)</TargetFrameworks>
     </PropertyGroup>
@@ -11,12 +10,12 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Data.SqlClient" Version="3.0.1"/>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)"/>
-        <PackageReference Include="Akka.Persistence.Sql.TestKit" Version="$(AkkaVersion)"/>
-        <PackageReference Include="Docker.DotNet" Version="3.125.12"/>
-        <PackageReference Include="xunit" Version="$(XunitVersion)"/>
-        <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)"/>
+        <PackageReference Include="Microsoft.Data.SqlClient" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk"/>
+        <PackageReference Include="Akka.Persistence.Sql.TestKit"/>
+        <PackageReference Include="Docker.DotNet"/>
+        <PackageReference Include="xunit"/>
+        <PackageReference Include="xunit.runner.visualstudio"/>
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Akka.Persistence.SqlServer/Akka.Persistence.SqlServer.csproj b/src/Akka.Persistence.SqlServer/Akka.Persistence.SqlServer.csproj
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-    <Import Project="..\common.props"/>
     <PropertyGroup>
         <AssemblyTitle>Akka.Persistence.SqlServer</AssemblyTitle>
         <Description>Akka.Persistence support for SQL Server.
@@ -14,7 +13,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Akka.Persistence.Sql.Common" Version="$(AkkaVersion)"/>
-        <PackageReference Include="Microsoft.Data.SqlClient" Version="3.0.1"/>
+        <PackageReference Include="Akka.Persistence.Sql.Common"/>
+        <PackageReference Include="Microsoft.Data.SqlClient"/>
     </ItemGroup>
 </Project>
diff --git a/src/common.props → src/Directory.Build.props b/src/common.props → src/Directory.Build.props
@@ -13,7 +13,7 @@
     <XunitVersion>2.4.2</XunitVersion>
     <AkkaVersion>1.4.49</AkkaVersion>
     <TestSdkVersion>17.4.1</TestSdkVersion>
-    <NetCoreTestVersion>netcoreapp3.1</NetCoreTestVersion>
+    <NetCoreTestVersion>net6.0</NetCoreTestVersion>
     <NetFrameworkTestVersion>net461</NetFrameworkTestVersion>
     <NetStandardLibVersion>netstandard2.0</NetStandardLibVersion>
   </PropertyGroup>
@@ -30,6 +30,6 @@
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
   </ItemGroup>
 </Project>
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -0,0 +1,27 @@
+<Project>
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+  </PropertyGroup>
+  <!-- App dependencies -->
+  <ItemGroup>
+    <PackageVersion Include="Akka.Persistence.Sql.Common" Version="$(AkkaVersion)"/>
+    <PackageVersion Include="Microsoft.Data.SqlClient" Version="3.0.1"/>
+  </ItemGroup>
+
+  <!-- Test dependencies -->  
+  <ItemGroup>
+	  <PackageVersion Include="FluentAssertions" Version="6.10.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+    <PackageVersion Include="xunit" Version="$(XunitVersion)" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="$(XunitVersion)" />
+    <PackageVersion Include="Akka.TestKit.Xunit2" Version="$(AkkaVersion)" />
+    <PackageVersion Include="Akka.Persistence.Sql.TestKit" Version="$(AkkaVersion)"/>
+    <PackageVersion Include="Docker.DotNet" Version="3.125.12"/>
+  </ItemGroup>
+
+	<!-- SourceLink support for all Akka.NET projects -->
+	<ItemGroup>
+		<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
+	</ItemGroup>
+
+</Project>