diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index c2069c7ba51..032387bec99 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -4,7 +4,7 @@ "features": { "ghcr.io/devcontainers/features/docker-in-docker:1": {}, "ghcr.io/devcontainers/features/dotnet": { - "version": "8.0.204" + "version": "6.0.421" }, "ghcr.io/devcontainers/features/node:1": { "version": "16" diff --git a/.gitignore b/.gitignore index 411fe4011a5..34d18c4cedc 100644 --- a/.gitignore +++ b/.gitignore @@ -26,5 +26,4 @@ _dotnetsdk TestResults TestLogs .DS_Store -.mono **/*.DotSettings.user \ No newline at end of file diff --git a/src/Runner.Common/Runner.Common.csproj b/src/Runner.Common/Runner.Common.csproj index 6c4635626a2..329a024aac6 100644 --- a/src/Runner.Common/Runner.Common.csproj +++ b/src/Runner.Common/Runner.Common.csproj @@ -1,11 +1,11 @@ - net8.0 + net6.0 Library win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64 true - NU1701;NU1603;SYSLIB0050;SYSLIB0051 + NU1701;NU1603 $(Version) @@ -15,11 +15,11 @@ - + - - - + + + diff --git a/src/Runner.Listener/Configuration/RSAEncryptedFileKeyManager.cs b/src/Runner.Listener/Configuration/RSAEncryptedFileKeyManager.cs index a404a674e96..15291be4387 100644 --- a/src/Runner.Listener/Configuration/RSAEncryptedFileKeyManager.cs +++ b/src/Runner.Listener/Configuration/RSAEncryptedFileKeyManager.cs @@ -1,5 +1,4 @@ #if OS_WINDOWS -#pragma warning disable CA1416 using System.IO; using System.Security.Cryptography; using System.Text; @@ -85,5 +84,4 @@ void IRunnerService.Initialize(IHostContext context) } } } -#pragma warning restore CA1416 #endif diff --git a/src/Runner.Listener/Runner.Listener.csproj b/src/Runner.Listener/Runner.Listener.csproj index afd528128a5..3cd72ec61f8 100644 --- a/src/Runner.Listener/Runner.Listener.csproj +++ b/src/Runner.Listener/Runner.Listener.csproj @@ -1,12 +1,11 @@ - net8.0 + net6.0 Exe win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64 - true true - NU1701;NU1603;SYSLIB0050;SYSLIB0051 + NU1701;NU1603 $(Version) false true @@ -19,11 +18,11 @@ - + - - - + + + diff --git a/src/Runner.Listener/Runner.cs b/src/Runner.Listener/Runner.cs index d83cefa0645..e2f638522b8 100644 --- a/src/Runner.Listener/Runner.cs +++ b/src/Runner.Listener/Runner.cs @@ -228,12 +228,10 @@ public async Task ExecuteCommand(CommandSettings command) var configFile = Path.Combine(HostContext.GetDirectory(WellKnownDirectory.Root), config.Key); var configContent = Convert.FromBase64String(config.Value); #if OS_WINDOWS -#pragma warning disable CA1416 if (configFile == HostContext.GetConfigFile(WellKnownConfigFile.RSACredentials)) { configContent = ProtectedData.Protect(configContent, null, DataProtectionScope.LocalMachine); } -#pragma warning restore CA1416 #endif File.WriteAllBytes(configFile, configContent); File.SetAttributes(configFile, File.GetAttributes(configFile) | FileAttributes.Hidden); diff --git a/src/Runner.PluginHost/Runner.PluginHost.csproj b/src/Runner.PluginHost/Runner.PluginHost.csproj index 81a8d2e4304..df30f3450a2 100644 --- a/src/Runner.PluginHost/Runner.PluginHost.csproj +++ b/src/Runner.PluginHost/Runner.PluginHost.csproj @@ -1,12 +1,11 @@  - net8.0 + net6.0 Exe win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64 - true true - NU1701;NU1603;SYSLIB0050;SYSLIB0051 + NU1701;NU1603 $(Version) false true diff --git a/src/Runner.Plugins/Runner.Plugins.csproj b/src/Runner.Plugins/Runner.Plugins.csproj index a786cf1cd1b..39245a3f7a7 100644 --- a/src/Runner.Plugins/Runner.Plugins.csproj +++ b/src/Runner.Plugins/Runner.Plugins.csproj @@ -1,12 +1,11 @@  - net8.0 + net6.0 Library win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64 - true true - NU1701;NU1603;SYSLIB0050;SYSLIB0051 + NU1701;NU1603 $(Version) diff --git a/src/Runner.Sdk/Runner.Sdk.csproj b/src/Runner.Sdk/Runner.Sdk.csproj index 55dbf12627c..202e8669a64 100644 --- a/src/Runner.Sdk/Runner.Sdk.csproj +++ b/src/Runner.Sdk/Runner.Sdk.csproj @@ -1,12 +1,11 @@  - net8.0 + net6.0 Library win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64 - true true - NU1701;NU1603;SYSLIB0050;SYSLIB0051 + NU1701;NU1603 $(Version) @@ -15,9 +14,9 @@ - - - + + + diff --git a/src/Runner.Worker/Runner.Worker.csproj b/src/Runner.Worker/Runner.Worker.csproj index 53c1610df3e..eee59b8721c 100644 --- a/src/Runner.Worker/Runner.Worker.csproj +++ b/src/Runner.Worker/Runner.Worker.csproj @@ -1,12 +1,11 @@ - net8.0 + net6.0 Exe win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64 - true true - NU1701;NU1603;SYSLIB0050;SYSLIB0051 + NU1701;NU1603 $(Version) false true @@ -19,9 +18,9 @@ - - - + + + diff --git a/src/Sdk/Common/Common/Exceptions/PropertyExceptions.cs b/src/Sdk/Common/Common/Exceptions/PropertyExceptions.cs index 72367654bf1..34c97b73a1d 100644 --- a/src/Sdk/Common/Common/Exceptions/PropertyExceptions.cs +++ b/src/Sdk/Common/Common/Exceptions/PropertyExceptions.cs @@ -34,7 +34,6 @@ protected VssPropertyValidationException(SerializationInfo info, StreamingContex public String PropertyName { get; set; } - [Obsolete] [SecurityCritical] public override void GetObjectData(SerializationInfo info, StreamingContext context) { diff --git a/src/Sdk/Common/Common/VssException.cs b/src/Sdk/Common/Common/VssException.cs index 5f8fb8c2554..7cead78655d 100644 --- a/src/Sdk/Common/Common/VssException.cs +++ b/src/Sdk/Common/Common/VssException.cs @@ -127,7 +127,6 @@ protected VssException(SerializationInfo info, StreamingContext context) EventId = (int)info.GetValue("m_eventId", typeof(int)); } - [Obsolete] [SecurityCritical] public override void GetObjectData(SerializationInfo info, StreamingContext context) { diff --git a/src/Sdk/Sdk.csproj b/src/Sdk/Sdk.csproj index a1ccd9be851..ff1cb85a4fe 100644 --- a/src/Sdk/Sdk.csproj +++ b/src/Sdk/Sdk.csproj @@ -1,12 +1,11 @@ - net8.0 + net6.0 Library win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64 - true - NU1701;NU1603;SYSLIB0050;SYSLIB0051 + NU1701;NU1603 $(Version) TRACE 8.0 @@ -15,13 +14,13 @@ - + - - - - - + + + + + diff --git a/src/Sdk/WebApi/WebApi/OAuth/VssOAuthExceptions.cs b/src/Sdk/WebApi/WebApi/OAuth/VssOAuthExceptions.cs index 34ec103d05f..5ebf86f9a8d 100644 --- a/src/Sdk/WebApi/WebApi/OAuth/VssOAuthExceptions.cs +++ b/src/Sdk/WebApi/WebApi/OAuth/VssOAuthExceptions.cs @@ -85,7 +85,6 @@ public String Error set; } - [Obsolete] public override void GetObjectData(SerializationInfo info, StreamingContext context) { base.GetObjectData(info, context); diff --git a/src/Sdk/WebApi/WebApi/VssServiceResponseException.cs b/src/Sdk/WebApi/WebApi/VssServiceResponseException.cs index 8dc275c0098..e4aa84a736d 100644 --- a/src/Sdk/WebApi/WebApi/VssServiceResponseException.cs +++ b/src/Sdk/WebApi/WebApi/VssServiceResponseException.cs @@ -24,7 +24,6 @@ protected VssServiceResponseException(SerializationInfo info, StreamingContext c HttpStatusCode = (HttpStatusCode)info.GetInt32("HttpStatusCode"); } - [Obsolete] [SecurityCritical] public override void GetObjectData(SerializationInfo info, StreamingContext context) { diff --git a/src/Test/Test.csproj b/src/Test/Test.csproj index aebe242096f..1beddbfc251 100644 --- a/src/Test/Test.csproj +++ b/src/Test/Test.csproj @@ -1,9 +1,9 @@ - net8.0 + net6.0 win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64 true - NU1701;NU1603;NU1603;xUnit2013;SYSLIB0050;SYSLIB0051 + NU1701;NU1603;NU1603;xUnit2013; @@ -15,13 +15,13 @@ - + - + - + - + diff --git a/src/dev.sh b/src/dev.sh index 29a5ecf1247..0fc58761e53 100755 --- a/src/dev.sh +++ b/src/dev.sh @@ -17,7 +17,7 @@ LAYOUT_DIR="$SCRIPT_DIR/../_layout" DOWNLOAD_DIR="$SCRIPT_DIR/../_downloads/netcore2x" PACKAGE_DIR="$SCRIPT_DIR/../_package" DOTNETSDK_ROOT="$SCRIPT_DIR/../_dotnetsdk" -DOTNETSDK_VERSION="8.0.204" +DOTNETSDK_VERSION="6.0.421" DOTNETSDK_INSTALLDIR="$DOTNETSDK_ROOT/$DOTNETSDK_VERSION" RUNNER_VERSION=$(cat runnerversion) diff --git a/src/global.json b/src/global.json index 1658e45125b..e7028fe0dd4 100644 --- a/src/global.json +++ b/src/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "8.0.204" + "version": "6.0.421" } }