diff --git a/src/Runner.Common/Runner.Common.csproj b/src/Runner.Common/Runner.Common.csproj index ec0e7bec6..220294acc 100644 --- a/src/Runner.Common/Runner.Common.csproj +++ b/src/Runner.Common/Runner.Common.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net6 Library win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64 true diff --git a/src/Runner.Listener/CommandSettings.cs b/src/Runner.Listener/CommandSettings.cs index da0d301fb..b73752c41 100644 --- a/src/Runner.Listener/CommandSettings.cs +++ b/src/Runner.Listener/CommandSettings.cs @@ -243,6 +243,7 @@ namespace GitHub.Runner.Listener validator: Validators.ServerUrlValidator); } +#if OS_WINDOWS public string GetWindowsLogonAccount(string defaultValue, string descriptionMsg) { return GetArgOrPrompt( @@ -251,6 +252,7 @@ namespace GitHub.Runner.Listener defaultValue: defaultValue, validator: Validators.NTAccountValidator); } +#endif public string GetWindowsLogonPassword(string accountName) { diff --git a/src/Runner.Listener/Configuration/Validators.cs b/src/Runner.Listener/Configuration/Validators.cs index 79d968221..ef5ff4140 100644 --- a/src/Runner.Listener/Configuration/Validators.cs +++ b/src/Runner.Listener/Configuration/Validators.cs @@ -67,6 +67,7 @@ namespace GitHub.Runner.Listener.Configuration return !string.IsNullOrEmpty(value); } +#if OS_WINDOWS public static bool NTAccountValidator(string arg) { if (string.IsNullOrEmpty(arg) || String.IsNullOrEmpty(arg.TrimStart('.', '\\'))) @@ -87,5 +88,6 @@ namespace GitHub.Runner.Listener.Configuration return true; } +#endif } } diff --git a/src/Runner.Listener/Program.cs b/src/Runner.Listener/Program.cs index a24224dad..1b1778d34 100644 --- a/src/Runner.Listener/Program.cs +++ b/src/Runner.Listener/Program.cs @@ -129,7 +129,7 @@ namespace GitHub.Runner.Listener private static void LoadAndSetEnv() { - var binDir = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location); + var binDir = Path.GetDirectoryName(AppContext.BaseDirectory); var rootDir = new DirectoryInfo(binDir).Parent.FullName; string envFile = Path.Combine(rootDir, ".env"); if (File.Exists(envFile)) diff --git a/src/Runner.Listener/Runner.Listener.csproj b/src/Runner.Listener/Runner.Listener.csproj index 09c77b8cc..5ef7a67a3 100644 --- a/src/Runner.Listener/Runner.Listener.csproj +++ b/src/Runner.Listener/Runner.Listener.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net6 Exe win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64 true diff --git a/src/Runner.PluginHost/Program.cs b/src/Runner.PluginHost/Program.cs index d823c6fa1..a48109396 100644 --- a/src/Runner.PluginHost/Program.cs +++ b/src/Runner.PluginHost/Program.cs @@ -95,7 +95,7 @@ namespace GitHub.Runner.PluginHost string assemblyFilename = assembly.Name + ".dll"; if (string.IsNullOrEmpty(executingAssemblyLocation)) { - executingAssemblyLocation = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); + executingAssemblyLocation = Path.GetDirectoryName(AppContext.BaseDirectory); } return context.LoadFromAssemblyPath(Path.Combine(executingAssemblyLocation, assemblyFilename)); } diff --git a/src/Runner.PluginHost/Runner.PluginHost.csproj b/src/Runner.PluginHost/Runner.PluginHost.csproj index e856d34b0..6d8f9bc96 100644 --- a/src/Runner.PluginHost/Runner.PluginHost.csproj +++ b/src/Runner.PluginHost/Runner.PluginHost.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net6 Exe win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64 true diff --git a/src/Runner.Plugins/Artifact/FileContainerServer.cs b/src/Runner.Plugins/Artifact/FileContainerServer.cs index 2d838bfeb..208b9e4c2 100644 --- a/src/Runner.Plugins/Artifact/FileContainerServer.cs +++ b/src/Runner.Plugins/Artifact/FileContainerServer.cs @@ -444,7 +444,7 @@ namespace GitHub.Runner.Plugins.Artifact { // We should never context.Error($"Error '{ex.Message}' when downloading file '{fileToDownload}'. (Downloader {downloaderId})"); - throw ex; + throw; } } @@ -528,7 +528,7 @@ namespace GitHub.Runner.Plugins.Artifact catch (Exception ex) { context.Output($"File error '{ex.Message}' when uploading file '{fileToUpload}'."); - throw ex; + throw; } } diff --git a/src/Runner.Plugins/Runner.Plugins.csproj b/src/Runner.Plugins/Runner.Plugins.csproj index 648ca718c..391e49244 100644 --- a/src/Runner.Plugins/Runner.Plugins.csproj +++ b/src/Runner.Plugins/Runner.Plugins.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net6 Library win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64 true diff --git a/src/Runner.Sdk/Runner.Sdk.csproj b/src/Runner.Sdk/Runner.Sdk.csproj index ee4fa0b85..21f33f18a 100644 --- a/src/Runner.Sdk/Runner.Sdk.csproj +++ b/src/Runner.Sdk/Runner.Sdk.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net6 Library win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64 true diff --git a/src/Runner.Worker/Expressions/HashFilesFunction.cs b/src/Runner.Worker/Expressions/HashFilesFunction.cs index a19f13e39..babce23aa 100644 --- a/src/Runner.Worker/Expressions/HashFilesFunction.cs +++ b/src/Runner.Worker/Expressions/HashFilesFunction.cs @@ -59,7 +59,7 @@ namespace GitHub.Runner.Worker.Expressions context.Trace.Info($"Search root directory: '{githubWorkspace}'"); context.Trace.Info($"Search pattern: '{string.Join(", ", patterns)}'"); - string binDir = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location); + string binDir = Path.GetDirectoryName(AppContext.BaseDirectory); string runnerRoot = new DirectoryInfo(binDir).Parent.FullName; string node = Path.Combine(runnerRoot, "externals", "node12", "bin", $"node{IOUtil.ExeExtension}"); diff --git a/src/Runner.Worker/Runner.Worker.csproj b/src/Runner.Worker/Runner.Worker.csproj index 8f7ff699c..c58a01a7b 100644 --- a/src/Runner.Worker/Runner.Worker.csproj +++ b/src/Runner.Worker/Runner.Worker.csproj @@ -1,7 +1,7 @@ - netcoreapp3.1 + net6 Exe win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64 true diff --git a/src/Sdk/Common/Common/Authentication/HttpRequestMessageWrapper.cs b/src/Sdk/Common/Common/Authentication/HttpRequestMessageWrapper.cs index ea0a25313..03e5bb4ea 100644 --- a/src/Sdk/Common/Common/Authentication/HttpRequestMessageWrapper.cs +++ b/src/Sdk/Common/Common/Authentication/HttpRequestMessageWrapper.cs @@ -28,14 +28,6 @@ namespace GitHub.Services.Common } } - public IDictionary Properties - { - get - { - return m_request.Properties; - } - } - IEnumerable IHttpHeaders.GetValues(String name) { IEnumerable values; diff --git a/src/Sdk/Common/Common/Authentication/IHttpRequest.cs b/src/Sdk/Common/Common/Authentication/IHttpRequest.cs index 802d7275d..b382845bb 100644 --- a/src/Sdk/Common/Common/Authentication/IHttpRequest.cs +++ b/src/Sdk/Common/Common/Authentication/IHttpRequest.cs @@ -14,10 +14,5 @@ namespace GitHub.Services.Common { get; } - - IDictionary Properties - { - get; - } } } diff --git a/src/Sdk/Common/Common/Diagnostics/HttpRequestMessageExtensions.cs b/src/Sdk/Common/Common/Diagnostics/HttpRequestMessageExtensions.cs index 30279a5c6..897cdc2c1 100644 --- a/src/Sdk/Common/Common/Diagnostics/HttpRequestMessageExtensions.cs +++ b/src/Sdk/Common/Common/Diagnostics/HttpRequestMessageExtensions.cs @@ -20,12 +20,11 @@ namespace GitHub.Services.Common.Diagnostics public static VssTraceActivity GetActivity(this HttpRequestMessage message) { - Object traceActivity; - if (!message.Properties.TryGetValue(VssTraceActivity.PropertyName, out traceActivity)) + if (!message.Options.TryGetValue(VssTraceActivity.PropertyName, out VssTraceActivity traceActivity)) { return VssTraceActivity.Empty; } - return (VssTraceActivity)traceActivity; + return traceActivity; } } } diff --git a/src/Sdk/Common/Common/Diagnostics/VssTraceActivity.cs b/src/Sdk/Common/Common/Diagnostics/VssTraceActivity.cs index 291b6d05a..c9ca9a6dd 100644 --- a/src/Sdk/Common/Common/Diagnostics/VssTraceActivity.cs +++ b/src/Sdk/Common/Common/Diagnostics/VssTraceActivity.cs @@ -1,6 +1,7 @@ using System; using System.Diagnostics; using System.Runtime.Serialization; +using System.Net.Http; namespace GitHub.Services.Common.Diagnostics { @@ -98,7 +99,7 @@ namespace GitHub.Services.Common.Diagnostics /// /// Gets the property name used to cache this object on extensible objects. /// - public const String PropertyName = "MS.VSS.Diagnostics.TraceActivity"; + public static readonly HttpRequestOptionsKey PropertyName = new HttpRequestOptionsKey("MS.VSS.Diagnostics.TraceActivity"); private static Lazy s_empty = new Lazy(() => new VssTraceActivity(Guid.Empty)); private sealed class CorrelationScope : IDisposable diff --git a/src/Sdk/Common/Common/VssHttpMessageHandler.cs b/src/Sdk/Common/Common/VssHttpMessageHandler.cs index e34ceee18..74342e134 100644 --- a/src/Sdk/Common/Common/VssHttpMessageHandler.cs +++ b/src/Sdk/Common/Common/VssHttpMessageHandler.cs @@ -110,7 +110,7 @@ namespace GitHub.Services.Common } } - internal static readonly String PropertyName = "MS.VS.MessageHandler"; + internal static readonly HttpRequestOptionsKey PropertyName = new HttpRequestOptionsKey("MS.VS.MessageHandler"); /// /// Handles the authentication hand-shake for a Visual Studio service. @@ -169,7 +169,7 @@ namespace GitHub.Services.Common } // Add ourselves to the message so the underlying token issuers may use it if necessary - request.Properties[VssHttpMessageHandler.PropertyName] = this; + request.Options.Set(VssHttpMessageHandler.PropertyName, this); Boolean succeeded = false; Boolean lastResponseDemandedProxyAuth = false; @@ -409,7 +409,7 @@ namespace GitHub.Services.Common // Read the completion option provided by the caller. If we don't find the property then we // assume it is OK to buffer by default. HttpCompletionOption completionOption; - if (!request.Properties.TryGetValue(VssHttpRequestSettings.HttpCompletionOptionPropertyName, out completionOption)) + if (!request.Options.TryGetValue(VssHttpRequestSettings.HttpCompletionOptionPropertyName, out completionOption)) { completionOption = HttpCompletionOption.ResponseContentRead; } diff --git a/src/Sdk/Common/Common/VssHttpMessageHandlerTraceInfo.cs b/src/Sdk/Common/Common/VssHttpMessageHandlerTraceInfo.cs index 3b5d63af6..417df94de 100644 --- a/src/Sdk/Common/Common/VssHttpMessageHandlerTraceInfo.cs +++ b/src/Sdk/Common/Common/VssHttpMessageHandlerTraceInfo.cs @@ -11,7 +11,7 @@ namespace GitHub.Services.Common { DateTime _lastTime; - static readonly String TfsTraceInfoKey = "TFS_TraceInfo"; + private static readonly HttpRequestOptionsKey TfsTraceInfoKey = new HttpRequestOptionsKey("TFS_TraceInfo"); public int TokenRetries { get; internal set; } @@ -76,10 +76,9 @@ namespace GitHub.Services.Common /// public static void SetTraceInfo(HttpRequestMessage message, VssHttpMessageHandlerTraceInfo traceInfo) { - object existingTraceInfo; - if (!message.Properties.TryGetValue(TfsTraceInfoKey, out existingTraceInfo)) + if (!message.Options.TryGetValue(TfsTraceInfoKey, out var _)) { - message.Properties.Add(TfsTraceInfoKey, traceInfo); + message.Options.Set(TfsTraceInfoKey, traceInfo); } } @@ -90,13 +89,8 @@ namespace GitHub.Services.Common /// public static VssHttpMessageHandlerTraceInfo GetTraceInfo(HttpRequestMessage message) { - VssHttpMessageHandlerTraceInfo traceInfo = null; - - if (message.Properties.TryGetValue(TfsTraceInfoKey, out object traceInfoObject)) - { - traceInfo = traceInfoObject as VssHttpMessageHandlerTraceInfo; - } - + VssHttpMessageHandlerTraceInfo traceInfo; + message.Options.TryGetValue(TfsTraceInfoKey, out traceInfo); return traceInfo; } diff --git a/src/Sdk/Common/Common/VssHttpRequestSettings.cs b/src/Sdk/Common/Common/VssHttpRequestSettings.cs index ac0dd9c3c..07c3829da 100644 --- a/src/Sdk/Common/Common/VssHttpRequestSettings.cs +++ b/src/Sdk/Common/Common/VssHttpRequestSettings.cs @@ -291,12 +291,12 @@ namespace GitHub.Services.Common protected internal virtual Boolean ApplyTo(HttpRequestMessage request) { // Make sure we only apply the settings to the request once - if (request.Properties.ContainsKey(PropertyName)) + if (request.Options.TryGetValue(PropertyName, out var _)) { return false; } - request.Properties.Add(PropertyName, this); + request.Options.Set(PropertyName, this); if (this.AcceptLanguages != null && this.AcceptLanguages.Count > 0) { @@ -366,12 +366,12 @@ namespace GitHub.Services.Common /// /// Gets the property name used to reference this object. /// - public const String PropertyName = "MS.VS.RequestSettings"; + public static readonly HttpRequestOptionsKey PropertyName = new HttpRequestOptionsKey("MS.VS.RequestSettings"); /// /// Gets the property name used to reference the completion option for a specific request. /// - public const String HttpCompletionOptionPropertyName = "MS.VS.HttpCompletionOption"; + public static readonly HttpRequestOptionsKey HttpCompletionOptionPropertyName = new HttpRequestOptionsKey("MS.VS.HttpCompletionOption"); /// /// Header to include the light weight response client option. diff --git a/src/Sdk/Common/Common/VssHttpRetryMessageHandler.cs b/src/Sdk/Common/Common/VssHttpRetryMessageHandler.cs index 69c6dacf2..5e60f33a5 100644 --- a/src/Sdk/Common/Common/VssHttpRetryMessageHandler.cs +++ b/src/Sdk/Common/Common/VssHttpRetryMessageHandler.cs @@ -53,23 +53,14 @@ namespace GitHub.Services.Common VssTraceActivity traceActivity = VssTraceActivity.Current; // Allow overriding default retry options per request - VssHttpRetryOptions retryOptions = m_retryOptions; - object retryOptionsObject; - if (request.Properties.TryGetValue(HttpRetryOptionsKey, out retryOptionsObject)) // NETSTANDARD compliant, TryGetValue is not - { - // Fallback to default options if object of unexpected type was passed - retryOptions = retryOptionsObject as VssHttpRetryOptions ?? m_retryOptions; - } - - TimeSpan minBackoff = retryOptions.MinBackoff; - Int32 maxAttempts = retryOptions.MaxRetries + 1; + VssHttpRetryOptions retryOptions; + request.Options.TryGetValue(HttpRetryOptionsKey, out retryOptions); + + TimeSpan minBackoff = (retryOptions ?? m_retryOptions).MinBackoff; + Int32 maxAttempts = (retryOptions ?? m_retryOptions).MaxRetries + 1; IVssHttpRetryInfo retryInfo = null; - object retryInfoObject; - if (request.Properties.TryGetValue(HttpRetryInfoKey, out retryInfoObject)) // NETSTANDARD compliant, TryGetValue is not - { - retryInfo = retryInfoObject as IVssHttpRetryInfo; - } + request.Options.TryGetValue(HttpRetryInfoKey, out retryInfo); if (IsLowPriority(request)) { @@ -225,8 +216,8 @@ namespace GitHub.Services.Common } private VssHttpRetryOptions m_retryOptions; - public const string HttpRetryInfoKey = "HttpRetryInfo"; - public const string HttpRetryOptionsKey = "VssHttpRetryOptions"; + public static readonly HttpRequestOptionsKey HttpRetryInfoKey = new HttpRequestOptionsKey("HttpRetryInfo"); + public static readonly HttpRequestOptionsKey HttpRetryOptionsKey = new HttpRequestOptionsKey("VssHttpRetryOptions"); private string m_clientName = ""; } } diff --git a/src/Sdk/Sdk.csproj b/src/Sdk/Sdk.csproj index 0641a3f3d..5dbebcd32 100644 --- a/src/Sdk/Sdk.csproj +++ b/src/Sdk/Sdk.csproj @@ -1,7 +1,7 @@ - netcoreapp3.1 + net6 Library win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64 true diff --git a/src/Sdk/WebApi/WebApi/VssHttpClientBase.cs b/src/Sdk/WebApi/WebApi/VssHttpClientBase.cs index b6c0f5e72..b4eee018a 100644 --- a/src/Sdk/WebApi/WebApi/VssHttpClientBase.cs +++ b/src/Sdk/WebApi/WebApi/VssHttpClientBase.cs @@ -833,7 +833,7 @@ namespace GitHub.Services.WebApi { if (userState != null) { - message.Properties[UserStatePropertyName] = userState; + message.Options.Set(UserStatePropertyName, userState); } if (!message.Headers.Contains(Common.Internal.HttpHeaders.VssE2EID)) @@ -842,11 +842,11 @@ namespace GitHub.Services.WebApi } VssHttpEventSource.Log.HttpRequestStart(traceActivity, message); message.Trace(); - message.Properties[VssTraceActivity.PropertyName] = traceActivity; + message.Options.Set(VssTraceActivity.PropertyName, traceActivity); // Send the completion option to the inner handler stack so we know when it's safe to buffer // and when we should avoid buffering. - message.Properties[VssHttpRequestSettings.HttpCompletionOptionPropertyName] = completionOption; + message.Options.Set(VssHttpRequestSettings.HttpCompletionOptionPropertyName, completionOption); //ConfigureAwait(false) enables the continuation to be run outside //any captured SyncronizationContext (such as ASP.NET's) which keeps things @@ -1154,7 +1154,9 @@ namespace GitHub.Services.WebApi { if (BaseAddress != null) { +#pragma warning disable SYSLIB0014 ServicePoint servicePoint = ServicePointManager.FindServicePoint(BaseAddress); +#pragma warning restore SYSLIB0014 servicePoint.UseNagleAlgorithm = false; servicePoint.SetTcpKeepAlive( enabled: true, @@ -1272,7 +1274,7 @@ namespace GitHub.Services.WebApi private const String c_jsonMediaType = "application/json"; - public readonly static String UserStatePropertyName = "VssClientBaseUserState"; + public static readonly HttpRequestOptionsKey UserStatePropertyName = new HttpRequestOptionsKey("VssClientBaseUserState"); protected sealed class OperationScope : IDisposable { diff --git a/src/Sdk/WebApi/WebApi/VssHttpUriUtility.cs b/src/Sdk/WebApi/WebApi/VssHttpUriUtility.cs index e3d6f8580..0afad2751 100644 --- a/src/Sdk/WebApi/WebApi/VssHttpUriUtility.cs +++ b/src/Sdk/WebApi/WebApi/VssHttpUriUtility.cs @@ -138,7 +138,7 @@ namespace GitHub.Services.WebApi if (routeReplacementOptions.HasFlag(RouteReplacementOptions.EscapeUri)) { - sbResult = new StringBuilder(Uri.EscapeUriString(sbResult.ToString())); + sbResult = new StringBuilder(Uri.EscapeDataString(sbResult.ToString())); } if (routeReplacementOptions.HasFlag(RouteReplacementOptions.AppendUnusedAsQueryParams) && unusedValues.Count > 0) diff --git a/src/Sdk/WebApi/WebApi/VssRequestTimerTrace.cs b/src/Sdk/WebApi/WebApi/VssRequestTimerTrace.cs index 160f7af60..9ea681051 100644 --- a/src/Sdk/WebApi/WebApi/VssRequestTimerTrace.cs +++ b/src/Sdk/WebApi/WebApi/VssRequestTimerTrace.cs @@ -6,27 +6,24 @@ using System.Globalization; using System.Linq; using System.Net.Http; using System.Net.Http.Headers; -using System.Runtime.InteropServices; namespace GitHub.Services.WebApi { internal static class HttpMessageExtensions { - private const string tracerKey = "VSS_HTTP_TIMER_TRACE"; + private static readonly HttpRequestOptionsKey tracerKey = new HttpRequestOptionsKey("VSS_HTTP_TIMER_TRACE"); internal static void Trace(this HttpRequestMessage request) { - Object tracerObj = null; - VssRequestTimerTrace tracer = null; - if (request.Properties.TryGetValue(tracerKey, out tracerObj)) + VssRequestTimerTrace tracer; + if (request.Options.TryGetValue(tracerKey, out tracer)) { - tracer = tracerObj as VssRequestTimerTrace; Debug.Assert(tracer != null, "Tracer object is the wrong type!"); } else { tracer = new VssRequestTimerTrace(); - request.Properties[tracerKey] = tracer; + request.Options.Set(tracerKey, tracer); } if (tracer != null) @@ -37,11 +34,9 @@ namespace GitHub.Services.WebApi internal static void Trace(this HttpResponseMessage response) { - Object tracerObj = null; - VssRequestTimerTrace tracer = null; - if (response.RequestMessage.Properties.TryGetValue(tracerKey, out tracerObj)) + VssRequestTimerTrace tracer; + if (response.RequestMessage.Options.TryGetValue(tracerKey, out tracer)) { - tracer = tracerObj as VssRequestTimerTrace; Debug.Assert(tracer != null, "Tracer object is the wrong type!"); } diff --git a/src/Test/L0/Listener/CommandSettingsL0.cs b/src/Test/L0/Listener/CommandSettingsL0.cs index b35729d49..cc5c75095 100644 --- a/src/Test/L0/Listener/CommandSettingsL0.cs +++ b/src/Test/L0/Listener/CommandSettingsL0.cs @@ -547,6 +547,7 @@ namespace GitHub.Runner.Common.Tests } } +#if OS_WINDOWS [Fact] [Trait("Level", "L0")] [Trait("Category", nameof(CommandSettings))] @@ -574,6 +575,7 @@ namespace GitHub.Runner.Common.Tests Assert.Equal("some windows logon account", actual); } } +#endif [Fact] [Trait("Level", "L0")] diff --git a/src/Test/Test.csproj b/src/Test/Test.csproj index ebeeaab97..e367a974f 100644 --- a/src/Test/Test.csproj +++ b/src/Test/Test.csproj @@ -1,6 +1,6 @@  - netcoreapp3.1 + net6 win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64 true NU1701;NU1603;NU1603;xUnit2013; diff --git a/src/dev.sh b/src/dev.sh index 15d396c2d..62f3a231d 100755 --- a/src/dev.sh +++ b/src/dev.sh @@ -14,10 +14,10 @@ DEV_TARGET_RUNTIME=$3 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" LAYOUT_DIR="$SCRIPT_DIR/../_layout" -DOWNLOAD_DIR="$SCRIPT_DIR/../_downloads/netcore2x" +DOWNLOAD_DIR="$SCRIPT_DIR/../_downloads/net6" PACKAGE_DIR="$SCRIPT_DIR/../_package" DOTNETSDK_ROOT="$SCRIPT_DIR/../_dotnetsdk" -DOTNETSDK_VERSION="3.1.302" +DOTNETSDK_VERSION="6.0.100" DOTNETSDK_INSTALLDIR="$DOTNETSDK_ROOT/$DOTNETSDK_VERSION" RUNNER_VERSION=$(cat runnerversion) diff --git a/src/global.json b/src/global.json index 2ae03c0b2..133c4785d 100644 --- a/src/global.json +++ b/src/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "3.1.302" + "version": "net6" } }