diff --git a/.editorconfig b/.editorconfig index 178d2855e1c..a5e7ee31870 100644 --- a/.editorconfig +++ b/.editorconfig @@ -230,6 +230,8 @@ dotnet_diagnostic.IDE0301.severity = suggestion dotnet_diagnostic.IDE0305.severity = suggestion #Collection initialization can be simplified dotnet_diagnostic.IDE0306.severity = suggestion +#Remove unnecessary nullable warning suppression +dotnet_diagnostic.IDE0370.severity = suggestion # License header file_header_template = Licensed to the .NET Foundation under one or more agreements.\nThe .NET Foundation licenses this file to you under the MIT license. diff --git a/NuGet.config b/NuGet.config index b97064a117d..916b2cf08ec 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 4f853497657..6616e4c90e9 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,8 +6,8 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.26070.104 - 2.0.3 + 10.0.0-beta.26077.113 + 2.0.4 10.0.1 10.0.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5e021a64521..aac8dfb67f1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 74dc6e4ed64cc0255a6be520761a857dda273863 diff --git a/eng/Versions.props b/eng/Versions.props index f9105809894..5396a2fbe70 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,7 +3,7 @@ - 10.0.103 + 10.0.104 servicing diff --git a/eng/common/core-templates/job/source-build.yml b/eng/common/core-templates/job/source-build.yml index d805d5faeb9..c08b3ad8ad0 100644 --- a/eng/common/core-templates/job/source-build.yml +++ b/eng/common/core-templates/job/source-build.yml @@ -63,7 +63,7 @@ jobs: demands: ImageOverride -equals build.ubuntu.2004.amd64 ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] - image: 1es-mariner-2 + image: Azure-Linux-3-Amd64 os: linux ${{ else }}: pool: diff --git a/global.json b/global.json index b31c84e2160..ad4532393fe 100644 --- a/global.json +++ b/global.json @@ -13,6 +13,6 @@ "dotnet": "10.0.102" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26070.104" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26077.113" } } diff --git a/test/Microsoft.TemplateEngine.TestHelper/TestUtils.cs b/test/Microsoft.TemplateEngine.TestHelper/TestUtils.cs index a08290bdb23..2cac468dd2c 100644 --- a/test/Microsoft.TemplateEngine.TestHelper/TestUtils.cs +++ b/test/Microsoft.TemplateEngine.TestHelper/TestUtils.cs @@ -100,19 +100,19 @@ public static async Task AttemptSearch(int count, TimeSpan interval, { if (attempt + 1 == count) { - throw ex; + throw; } if (ex is AggregateException agEx) { if (!agEx.InnerExceptions.Any(e => e is TEx)) { - throw ex; + throw; } } else if (ex is not TEx) { - throw ex; + throw; } } await Task.Delay(interval);