Skip to content

Commit ac0bc86

Browse files
AArnottAArnott
authored
Merge pull request #696 from dotnet/net60sdk
Build with the .NET 6.0 SDK, update packages
2 parents 7bf21b1 + 3488556 commit ac0bc86

File tree

8 files changed

+38
-25
lines changed

8 files changed

+38
-25
lines changed

‎azure-pipelines.yml‎

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -54,24 +54,31 @@ stages:
5454
git config --global user.name ci
5555
git config --global user.email [email protected]
5656
displayName: Configure git commit author for testing
57+
- task: UseDotNet@2
58+
displayName: Install .NET Core 3.1 runtime
59+
inputs:
60+
packageType: runtime
61+
version: 3.1.x
5762

5863
- task: UseDotNet@2
59-
displayName: Install .NET Core 5.0.401 SDK
64+
displayName: Install .NET 5.0 SDK
6065
inputs:
61-
packageType: sdk
62-
version: 5.0.401
66+
packageType: sdk # necessary for msbuild tests to run on .NET 5 runtime
67+
version: 5.0.x
6368

6469
- task: UseDotNet@2
65-
displayName: Install .NET Core 3.1 runtime
70+
displayName: Install .NET 6.0 SDK
6671
inputs:
67-
packageType: runtime
68-
version: 3.1.x
72+
packageType: sdk
73+
version: 6.0.100
74+
6975

7076
- pwsh: |
7177
Invoke-WebRequest -Uri "https://dot.net/v1/dotnet-install.ps1" -OutFile dotnet-install.ps1
72-
& .\dotnet-install.ps1 -Architecture x86 -Version 5.0.401 -InstallDir "C:\Program Files (x86)\dotnet\" -NoPath -Verbose
73-
& .\dotnet-install.ps1 -Architecture x86 -Channel 3.1 -InstallDir "C:\Program Files (x86)\dotnet\" -NoPath -Verbose
74-
displayName: Install 32-bit .NET Core SDK 5.0.401, 3.1
78+
& .\dotnet-install.ps1 -Architecture x86 -Channel 3.1 -InstallDir "C:\Program Files (x86)\dotnet\" -NoPath -Verbose -Runtime dotnet
79+
& .\dotnet-install.ps1 -Architecture x86 -Channel 5.0 -InstallDir "C:\Program Files (x86)\dotnet\" -NoPath -Verbose
80+
& .\dotnet-install.ps1 -Architecture x86 -Version 6.0.100 -InstallDir "C:\Program Files (x86)\dotnet\" -NoPath -Verbose
81+
displayName: Install 32-bit .NET SDK and runtimes
7582
condition: ne(variables['dotnet32'], '')
7683
7784
- script: dotnet --info
@@ -328,10 +335,15 @@ stages:
328335
packageType: runtime
329336
version: 3.1.x
330337
- task: UseDotNet@2
331-
displayName: Install .NET Core 5.0.401 SDK
338+
displayName: Install .NET 5.0 runtime
339+
inputs:
340+
packageType: runtime
341+
version: 5.0.x
342+
- task: UseDotNet@2
343+
displayName: Install .NET 6.0.100 SDK
332344
inputs:
333345
packageType: sdk
334-
version: 5.0.401
346+
version: 6.0.100
335347
- script: dotnet --info
336348
displayName: Show dotnet SDK info
337349
- bash: |

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "5.0.401",
3+
"version": "6.0.100",
44
"rollForward": "patch",
55
"allowPrerelease": false
66
}

‎src/Cake.GitVersioning.Tests/Cake.GitVersioning.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<ProjectReference Include="..\NerdBank.GitVersioning\NerdBank.GitVersioning.csproj" />
1616
</ItemGroup>
1717
<ItemGroup>
18-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
18+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
1919
<PackageReference Include="Nerdbank.GitVersioning.LKG" Version="3.4.173-alpha" />
2020
<PackageReference Include="xunit" Version="2.4.1" />
2121
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">

‎src/Cake.GitVersioning/Cake.GitVersioning.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@
4141
<None Include="$(LibGit2SharpNativeBinaries)runtimes\**\*.*" Pack="true" PackagePath="lib\netstandard2.0\lib\" LinkBase="lib" />
4242

4343
<!-- Additional copies to work around DllNotFoundException on Mono (https://github.com/AArnott/Nerdbank.GitVersioning/issues/222) -->
44-
<None Include="$(LibGit2SharpNativeBinaries)runtimes\osx\native\*.dylib" Pack="true" PackagePath="lib\netstandard2.0\lib\osx\" LinkBase="lib\osx" />
44+
<None Include="$(LibGit2SharpNativeBinaries)runtimes\osx-x64\native\*.dylib" Pack="true" PackagePath="lib\netstandard2.0\lib\osx\x86_64\" LinkBase="lib\osx\x86_64" />
45+
<None Include="$(LibGit2SharpNativeBinaries)runtimes\osx-arm64\native\*.dylib" Pack="true" PackagePath="lib\netstandard2.0\lib\osx\arm_64\" LinkBase="lib\arm64\arm_64" />
4546
<None Include="$(LibGit2SharpNativeBinaries)runtimes\linux-x64\native\*.so" Pack="true" PackagePath="lib\netstandard2.0\lib\linux\x86_64\" LinkBase="lib\linux\x86_64" />
4647
<None Include="$(LibGit2SharpNativeBinaries)runtimes\win-x64\native\*.dll" Pack="true" PackagePath="lib\netstandard2.0\lib\win32\x64\" LinkBase="lib\win32\x64" />
4748
<None Include="$(LibGit2SharpNativeBinaries)runtimes\win-x86\native\*.dll" Pack="true" PackagePath="lib\netstandard2.0\lib\win32\x86\" LinkBase="lib\win32\x86" />

‎src/Directory.Build.props‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,12 @@
2121
</PropertyGroup>
2222
<PropertyGroup>
2323
<!-- LibGit2Sharp Native Binary version - used in both main project and Cake addin -->
24-
<LibGit2SharpNativeVersion>2.0.312</LibGit2SharpNativeVersion>
24+
<LibGit2SharpNativeVersion>2.0.315-alpha.0.9</LibGit2SharpNativeVersion>
2525
</PropertyGroup>
2626
<ItemGroup>
27-
<PackageReference Include="Microsoft.Net.Compilers.Toolset" Version="3.11.0" PrivateAssets="all" />
28-
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
29-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
30-
<PackageReference Include="CSharpIsNullAnalyzer" Version="0.1.288-beta">
27+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" PrivateAssets="All" />
28+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
29+
<PackageReference Include="CSharpIsNullAnalyzer" Version="0.1.300">
3130
<PrivateAssets>all</PrivateAssets>
3231
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
3332
</PackageReference>

‎src/NerdBank.GitVersioning.Tests/NerdBank.GitVersioning.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<PackageReference Include="System.Collections.Immutable" Version="1.5.0" />
3737
<PackageReference Include="Microsoft.Build" Version="15.1.548" ExcludeAssets="runtime" />
3838
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.1.548" ExcludeAssets="runtime" />
39-
<PackageReference Include="Microsoft.Build.Locator" Version="1.2.6" />
39+
<PackageReference Include="Microsoft.Build.Locator" Version="1.4.1" />
4040
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.9.0" />
4141
<PackageReference Include="Xunit.Combinatorial" Version="1.2.7" />
4242
<PackageReference Include="xunit" Version="2.4.1" />

‎src/NerdBank.GitVersioning/NerdBank.GitVersioning.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</PropertyGroup>
1111
<ItemGroup>
1212
<PackageReference Include="DotNetMDDocs" Version="0.111.0" PrivateAssets="all" Condition=" '$(GenerateMarkdownApiDocs)' == 'true' " />
13-
<PackageReference Include="LibGit2Sharp" Version="0.27.0-preview-0102" PrivateAssets="none" />
13+
<PackageReference Include="LibGit2Sharp" Version="0.27.0-preview-0158" PrivateAssets="none" />
1414
<PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="2.1.0" />
1515
<PackageReference Include="Microsoft.Windows.CsWin32" Version="0.1.478-beta" PrivateAssets="all" />
1616
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />

‎src/Nerdbank.GitVersioning.Tasks/Nerdbank.GitVersioning.nuspec‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,13 @@ IMPORTANT: The 3.x release may produce a different version height than prior maj
3232
<file src="$LibGit2SharpNativeBinaries$runtimes\**" target="build\runtimes\" />
3333

3434
<!-- Additional copies to work around DllNotFoundException on Mono (https://github.com/dotnet/Nerdbank.GitVersioning/issues/222) -->
35-
<file src="$LibGit2SharpNativeBinaries$runtimes\osx\native\libgit2-6777db8.dylib" target="build\MSBuildFull\lib\osx\libgit2-6777db8.dylib" />
36-
<file src="$LibGit2SharpNativeBinaries$runtimes\linux-x64\native\libgit2-6777db8.so" target="build\MSBuildFull\lib\linux-x64\libgit2-6777db8.so" />
35+
<file src="$LibGit2SharpNativeBinaries$runtimes\osx-x64\native\libgit2-b7bad55.dylib" target="build\MSBuildFull\lib\osx-x64\libgit2-b7bad55.dylib" />
36+
<file src="$LibGit2SharpNativeBinaries$runtimes\osx-arm64\native\libgit2-b7bad55.dylib" target="build\MSBuildFull\lib\osx-arm64\libgit2-b7bad55.dylib" />
37+
<file src="$LibGit2SharpNativeBinaries$runtimes\linux-x64\native\libgit2-b7bad55.so" target="build\MSBuildFull\lib\linux-x64\libgit2-b7bad55.so" />
3738

3839
<!-- Additional copies to work with our own ps1 scripts (https://github.com/dotnet/Nerdbank.GitVersioning/issues/248) -->
39-
<file src="$LibGit2SharpNativeBinaries$runtimes\win-x64\native\git2-6777db8.dll" target="build\MSBuildFull\lib\win32\x64\git2-6777db8.dll" />
40-
<file src="$LibGit2SharpNativeBinaries$runtimes\win-x86\native\git2-6777db8.dll" target="build\MSBuildFull\lib\win32\x86\git2-6777db8.dll" />
40+
<file src="$LibGit2SharpNativeBinaries$runtimes\win-x64\native\git2-b7bad55.dll" target="build\MSBuildFull\lib\win32\x64\git2-b7bad55.dll" />
41+
<file src="$LibGit2SharpNativeBinaries$runtimes\win-x86\native\git2-b7bad55.dll" target="build\MSBuildFull\lib\win32\x86\git2-b7bad55.dll" />
4142

4243
<file src="$LibGit2SharpNativeBinaries$libgit2\LibGit2Sharp.dll.config" target="build\MSBuildCore\LibGit2Sharp.dll.config" />
4344
<file src="$BaseOutputPath$netcoreapp3.1\LibGit2Sharp.dll" target="build\MSBuildCore\LibGit2Sharp.dll" />

0 commit comments

Comments
 (0)