Skip to content

Commit af8dee5

Browse files
authored
Bump dotnet SDK to dotnet 8. (#3500)
1 parent 9b3b554 commit af8dee5

File tree

19 files changed

+61
-46
lines changed

19 files changed

+61
-46
lines changed

.devcontainer/devcontainer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
"features": {
55
"ghcr.io/devcontainers/features/docker-in-docker:1": {},
66
"ghcr.io/devcontainers/features/dotnet": {
7-
"version": "6.0.425"
7+
"version": "8.0.403"
88
},
99
"ghcr.io/devcontainers/features/node:1": {
10-
"version": "16"
10+
"version": "20"
1111
},
1212
"ghcr.io/devcontainers/features/sshd:1": {
1313
"version": "latest"

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,5 @@ _dotnetsdk
2626
TestResults
2727
TestLogs
2828
.DS_Store
29+
.mono
2930
**/*.DotSettings.user

src/Runner.Common/Runner.Common.csproj

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<OutputType>Library</OutputType>
66
<RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64</RuntimeIdentifiers>
77
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
8-
<NoWarn>NU1701;NU1603</NoWarn>
8+
<NoWarn>NU1701;NU1603;SYSLIB0050;SYSLIB0051</NoWarn>
99
<Version>$(Version)</Version>
1010
</PropertyGroup>
1111

@@ -15,11 +15,11 @@
1515
</ItemGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="Microsoft.Win32.Registry" Version="4.4.0" />
18+
<PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
1919
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
20-
<PackageReference Include="System.Security.Cryptography.ProtectedData" Version="4.4.0" />
21-
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.4.0" />
22-
<PackageReference Include="System.Threading.Channels" Version="4.4.0" />
20+
<PackageReference Include="System.Security.Cryptography.ProtectedData" Version="8.0.0" />
21+
<PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
22+
<PackageReference Include="System.Threading.Channels" Version="8.0.0" />
2323
</ItemGroup>
2424

2525
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

src/Runner.Listener/Configuration/RSAEncryptedFileKeyManager.cs

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#if OS_WINDOWS
2+
#pragma warning disable CA1416
23
using System.IO;
34
using System.Security.Cryptography;
45
using System.Text;
@@ -84,4 +85,5 @@ void IRunnerService.Initialize(IHostContext context)
8485
}
8586
}
8687
}
88+
#pragma warning restore CA1416
8789
#endif

src/Runner.Listener/Runner.Listener.csproj

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<OutputType>Exe</OutputType>
66
<RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64</RuntimeIdentifiers>
7+
<SelfContained>true</SelfContained>
78
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
8-
<NoWarn>NU1701;NU1603</NoWarn>
9+
<NoWarn>NU1701;NU1603;SYSLIB0050;SYSLIB0051</NoWarn>
910
<Version>$(Version)</Version>
1011
<PredefinedCulturesOnly>false</PredefinedCulturesOnly>
1112
<PublishReadyToRunComposite>true</PublishReadyToRunComposite>
@@ -18,11 +19,11 @@
1819
</ItemGroup>
1920

2021
<ItemGroup>
21-
<PackageReference Include="Microsoft.Win32.Registry" Version="4.4.0" />
22+
<PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
2223
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
23-
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.4.0" />
24-
<PackageReference Include="System.Security.Cryptography.ProtectedData" Version="4.4.0" />
25-
<PackageReference Include="System.ServiceProcess.ServiceController" Version="4.4.0" />
24+
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
25+
<PackageReference Include="System.Security.Cryptography.ProtectedData" Version="8.0.0" />
26+
<PackageReference Include="System.ServiceProcess.ServiceController" Version="8.0.0" />
2627
</ItemGroup>
2728

2829
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

src/Runner.Listener/Runner.cs

+2
Original file line numberDiff line numberDiff line change
@@ -228,10 +228,12 @@ public async Task<int> ExecuteCommand(CommandSettings command)
228228
var configFile = Path.Combine(HostContext.GetDirectory(WellKnownDirectory.Root), config.Key);
229229
var configContent = Convert.FromBase64String(config.Value);
230230
#if OS_WINDOWS
231+
#pragma warning disable CA1416
231232
if (configFile == HostContext.GetConfigFile(WellKnownConfigFile.RSACredentials))
232233
{
233234
configContent = ProtectedData.Protect(configContent, null, DataProtectionScope.LocalMachine);
234235
}
236+
#pragma warning restore CA1416
235237
#endif
236238
File.WriteAllBytes(configFile, configContent);
237239
File.SetAttributes(configFile, File.GetAttributes(configFile) | FileAttributes.Hidden);

src/Runner.PluginHost/Runner.PluginHost.csproj

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<OutputType>Exe</OutputType>
66
<RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64</RuntimeIdentifiers>
7+
<SelfContained>true</SelfContained>
78
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
8-
<NoWarn>NU1701;NU1603</NoWarn>
9+
<NoWarn>NU1701;NU1603;SYSLIB0050;SYSLIB0051</NoWarn>
910
<Version>$(Version)</Version>
1011
<PredefinedCulturesOnly>false</PredefinedCulturesOnly>
1112
<PublishReadyToRunComposite>true</PublishReadyToRunComposite>

src/Runner.Plugins/Runner.Plugins.csproj

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<OutputType>Library</OutputType>
66
<RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64</RuntimeIdentifiers>
7+
<SelfContained>true</SelfContained>
78
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
8-
<NoWarn>NU1701;NU1603</NoWarn>
9+
<NoWarn>NU1701;NU1603;SYSLIB0050;SYSLIB0051</NoWarn>
910
<Version>$(Version)</Version>
1011
</PropertyGroup>
1112

src/Runner.Sdk/Runner.Sdk.csproj

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<OutputType>Library</OutputType>
66
<RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64</RuntimeIdentifiers>
7+
<SelfContained>true</SelfContained>
78
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
8-
<NoWarn>NU1701;NU1603</NoWarn>
9+
<NoWarn>NU1701;NU1603;SYSLIB0050;SYSLIB0051</NoWarn>
910
<Version>$(Version)</Version>
1011
</PropertyGroup>
1112

@@ -14,9 +15,9 @@
1415
</ItemGroup>
1516

1617
<ItemGroup>
17-
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.4.0" />
18-
<PackageReference Include="Microsoft.Win32.Registry" Version="4.4.0" />
19-
<PackageReference Include="System.Threading.Channels" Version="4.4.0" />
18+
<PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
19+
<PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
20+
<PackageReference Include="System.Threading.Channels" Version="8.0.0" />
2021
</ItemGroup>
2122

2223
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

src/Runner.Worker/Runner.Worker.csproj

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<OutputType>Exe</OutputType>
66
<RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64</RuntimeIdentifiers>
7+
<SelfContained>true</SelfContained>
78
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
8-
<NoWarn>NU1701;NU1603</NoWarn>
9+
<NoWarn>NU1701;NU1603;SYSLIB0050;SYSLIB0051</NoWarn>
910
<Version>$(Version)</Version>
1011
<PredefinedCulturesOnly>false</PredefinedCulturesOnly>
1112
<PublishReadyToRunComposite>true</PublishReadyToRunComposite>
@@ -18,9 +19,9 @@
1819
</ItemGroup>
1920

2021
<ItemGroup>
21-
<PackageReference Include="System.Security.Cryptography.ProtectedData" Version="4.4.0" />
22-
<PackageReference Include="System.ServiceProcess.ServiceController" Version="4.4.0" />
23-
<PackageReference Include="System.Threading.Channels" Version="4.4.0" />
22+
<PackageReference Include="System.Security.Cryptography.ProtectedData" Version="8.0.0" />
23+
<PackageReference Include="System.ServiceProcess.ServiceController" Version="8.0.0" />
24+
<PackageReference Include="System.Threading.Channels" Version="8.0.0" />
2425
<PackageReference Include="YamlDotNet.Signed" Version="5.3.0" />
2526
</ItemGroup>
2627

src/Sdk/Common/Common/Exceptions/PropertyExceptions.cs

+1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ protected VssPropertyValidationException(SerializationInfo info, StreamingContex
3434

3535
public String PropertyName { get; set; }
3636

37+
[Obsolete]
3738
[SecurityCritical]
3839
public override void GetObjectData(SerializationInfo info, StreamingContext context)
3940
{

src/Sdk/Common/Common/VssException.cs

+1
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ protected VssException(SerializationInfo info, StreamingContext context)
127127
EventId = (int)info.GetValue("m_eventId", typeof(int));
128128
}
129129

130+
[Obsolete]
130131
[SecurityCritical]
131132
public override void GetObjectData(SerializationInfo info, StreamingContext context)
132133
{

src/Sdk/Sdk.csproj

+9-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<OutputType>Library</OutputType>
66
<RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64</RuntimeIdentifiers>
7+
<!-- <SelfContained>true</SelfContained> -->
78
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
8-
<NoWarn>NU1701;NU1603</NoWarn>
9+
<NoWarn>NU1701;NU1603;SYSLIB0050;SYSLIB0051</NoWarn>
910
<Version>$(Version)</Version>
1011
<DefineConstants>TRACE</DefineConstants>
1112
<LangVersion>8.0</LangVersion>
@@ -14,13 +15,13 @@
1415

1516
<ItemGroup>
1617
<PackageReference Include="Azure.Storage.Blobs" Version="12.19.1" />
17-
<PackageReference Include="Microsoft.Win32.Registry" Version="4.4.0" />
18+
<PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
1819
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
19-
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.9" />
20-
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.2.1" />
21-
<PackageReference Include="System.Security.Cryptography.Cng" Version="4.4.0" />
22-
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="4.4.0" />
23-
<PackageReference Include="System.Security.Cryptography.ProtectedData" Version="4.4.0" />
20+
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="6.0.0" />
21+
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.5.1" />
22+
<PackageReference Include="System.Security.Cryptography.Cng" Version="5.0.0" />
23+
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="8.0.0" />
24+
<PackageReference Include="System.Security.Cryptography.ProtectedData" Version="8.0.0" />
2425
<PackageReference Include="Minimatch" Version="2.0.0" />
2526
<PackageReference Include="YamlDotNet.Signed" Version="5.3.0" />
2627
<PackageReference Include="System.Net.Http" Version="4.3.4" />

src/Sdk/WebApi/WebApi/OAuth/VssOAuthExceptions.cs

+1
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ public String Error
8585
set;
8686
}
8787

88+
[Obsolete]
8889
public override void GetObjectData(SerializationInfo info, StreamingContext context)
8990
{
9091
base.GetObjectData(info, context);

src/Sdk/WebApi/WebApi/VssServiceResponseException.cs

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ protected VssServiceResponseException(SerializationInfo info, StreamingContext c
2424
HttpStatusCode = (HttpStatusCode)info.GetInt32("HttpStatusCode");
2525
}
2626

27+
[Obsolete]
2728
[SecurityCritical]
2829
public override void GetObjectData(SerializationInfo info, StreamingContext context)
2930
{

src/Test/Test.csproj

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net6.0</TargetFramework>
3+
<TargetFramework>net8.0</TargetFramework>
44
<RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64</RuntimeIdentifiers>
55
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
6-
<NoWarn>NU1701;NU1603;NU1603;xUnit2013;</NoWarn>
6+
<NoWarn>NU1701;NU1603;NU1603;xUnit2013;SYSLIB0050;SYSLIB0051</NoWarn>
77
</PropertyGroup>
88

99
<ItemGroup>
@@ -15,13 +15,13 @@
1515
</ItemGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
18+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
1919
<PackageReference Include="xunit" Version="2.7.1" />
20-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
20+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.8" />
2121
<PackageReference Include="System.Buffers" Version="4.5.1" />
22-
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.4.0" />
22+
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.7.0" />
2323
<PackageReference Include="System.Threading.ThreadPool" Version="4.3.0" />
24-
<PackageReference Include="Moq" Version="4.11.0" />
24+
<PackageReference Include="Moq" Version="4.20.70" />
2525
</ItemGroup>
2626

2727
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"version": "8.0.303"
3+
"version": "8.0.403"
44
}
55
}

src/dev.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ LAYOUT_DIR="$SCRIPT_DIR/../_layout"
1717
DOWNLOAD_DIR="$SCRIPT_DIR/../_downloads/netcore2x"
1818
PACKAGE_DIR="$SCRIPT_DIR/../_package"
1919
DOTNETSDK_ROOT="$SCRIPT_DIR/../_dotnetsdk"
20-
DOTNETSDK_VERSION="6.0.425"
20+
DOTNETSDK_VERSION="8.0.403"
2121
DOTNETSDK_INSTALLDIR="$DOTNETSDK_ROOT/$DOTNETSDK_VERSION"
22-
DOTNET8SDK_VERSION="8.0.303"
22+
DOTNET8SDK_VERSION="8.0.403"
2323
DOTNET8SDK_INSTALLDIR="$DOTNETSDK_ROOT/$DOTNET8SDK_VERSION"
2424
RUNNER_VERSION=$(cat runnerversion)
2525

src/global.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"version": "6.0.425"
3+
"version": "8.0.403"
44
}
55
}

0 commit comments

Comments
 (0)