[automated] Merge branch 'release/10.0.4xx' => 'main'

eng/Version.Details.props

@@ -7,7 +7,7 @@ This file should be imported by eng/Versions.props
   <PropertyGroup>
     <!-- dotnet-dotnet dependencies -->
     <MicrosoftBclAsyncInterfacesPackageVersion>10.0.6</MicrosoftBclAsyncInterfacesPackageVersion>
-    <MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26217.116</MicrosoftDotNetArcadeSdkPackageVersion>
+    <MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26264.101</MicrosoftDotNetArcadeSdkPackageVersion>
     <MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>10.0.6</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
     <MicrosoftExtensionsLoggingPackageVersion>10.0.6</MicrosoftExtensionsLoggingPackageVersion>
     <MicrosoftExtensionsLoggingAbstractionsPackageVersion>10.0.6</MicrosoftExtensionsLoggingAbstractionsPackageVersion>

eng/Version.Details.xml

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
-  <Source Uri="https://github.com/dotnet/dotnet" Mapping="templating" Sha="5b150b1d949d9509e9822fa44fd52923d1d162e5" BarId="311030" />
+  <Source Uri="https://github.com/dotnet/dotnet" Mapping="templating" Sha="d1c618b916b548d50092bda48bdc1e74501ce0f7" BarId="314331" />
   <ProductDependencies>
     <Dependency Name="System.CommandLine" Version="2.0.6">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
       <Sha>47fb725acf5d7094af51aebbb5b7e5c44a3b2a77</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26217.116">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26264.101">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>5b150b1d949d9509e9822fa44fd52923d1d162e5</Sha>
+      <Sha>d1c618b916b548d50092bda48bdc1e74501ce0f7</Sha>
     </Dependency>
     <!-- Dependencies required for source build. We'll still update manually -->
     <Dependency Name="System.Formats.Asn1" Version="10.0.6">

eng/Versions.props

@@ -1,7 +1,7 @@
 <Project>
   <Import Project="Version.Details.props" Condition="Exists('Version.Details.props')" />
   <PropertyGroup>
-    <VersionPrefix>10.0.300</VersionPrefix>
+    <VersionPrefix>10.0.400</VersionPrefix>
     <!-- When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages.
          NOTE: This repository stabilizes via VMR and this should not be set except in dev scenarios -->
     <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "10.0.105",
+    "version": "10.0.300",
     "allowPrerelease": true,
     "rollForward": "latestFeature",
     "paths": [
@@ -10,9 +10,9 @@
     "errorMessage": "The required .NET SDK wasn't found. Please run ./eng/common/dotnet.cmd/sh to install it."
   },
   "tools": {
-    "dotnet": "10.0.105"
+    "dotnet": "10.0.300"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26217.116"
+    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26264.101"
   }
 }

src/Microsoft.TemplateEngine.Core/Expressions/Shared/SharedEvaluatorDefinition.cs

@@ -197,8 +197,8 @@ private static bool Evaluate(
 
         private static int? AttemptBooleanComparison(object? left, object? right)
         {
-            bool leftIsBool = Map.TryConvert(left!, out bool lb);
-            bool rightIsBool = Map.TryConvert(right!, out bool rb);
+            bool leftIsBool = Map.TryConvert(left, out bool lb);
+            bool rightIsBool = Map.TryConvert(right, out bool rb);
 
             if (!leftIsBool || !rightIsBool)
             {
@@ -240,12 +240,12 @@ private static bool Evaluate(
 
         private static int? AttemptNumericComparison(object? left, object? right)
         {
-            bool leftIsDouble = Map.TryConvert(left!, out double ld);
-            bool rightIsDouble = Map.TryConvert(right!, out double rd);
+            bool leftIsDouble = Map.TryConvert(left, out double ld);
+            bool rightIsDouble = Map.TryConvert(right, out double rd);
 
             if (!leftIsDouble)
             {
-                if (!Map.TryConvert(left!, out long ll))
+                if (!Map.TryConvert(left, out long ll))
                 {
                     return null;
                 }
@@ -255,7 +255,7 @@ private static bool Evaluate(
 
             if (!rightIsDouble)
             {
-                if (!Map.TryConvert(right!, out long rl))
+                if (!Map.TryConvert(right, out long rl))
                 {
                     return null;
                 }

src/Microsoft.TemplateEngine.Edge/Constraints/NuGetFloatRangeSpecification.cs

@@ -30,7 +30,9 @@ internal static bool TryParse(string value, out NuGetFloatRangeSpecification? ve
         {
             if (FloatRange.TryParse(value, out FloatRange? versionRange))
             {
+#pragma warning disable IDE0370
                 version = new NuGetFloatRangeSpecification(versionRange!);
+#pragma warning restore IDE0370
                 return true;
             }
             version = null;

src/Microsoft.TemplateEngine.Edge/Constraints/NuGetVersionRangeSpecification.cs

@@ -30,7 +30,9 @@ internal static bool TryParse(string value, out NuGetVersionRangeSpecification?
         {
             if (VersionRange.TryParse(value, out VersionRange? versionRange))
             {
+#pragma warning disable IDE0370
                 version = new NuGetVersionRangeSpecification(versionRange!);
+#pragma warning restore IDE0370
                 return true;
             }
             version = null;

src/Microsoft.TemplateEngine.Edge/Constraints/NuGetVersionSpecification.cs

@@ -30,7 +30,9 @@ internal static bool TryParse(string value, out NuGetVersionSpecification? versi
         {
             if (NuGetVersion.TryParse(value, out NuGetVersion? nuGetVersion))
             {
+#pragma warning disable IDE0370
                 version = new NuGetVersionSpecification(nuGetVersion!);
+#pragma warning restore IDE0370
                 return true;
             }
             version = null;

src/Microsoft.TemplateEngine.Edge/Template/ParameterSetBuilder.cs

@@ -150,7 +150,7 @@ public InputDataSet Build(bool evaluateConditions, IGenerator generator, ILogger
                     _resolvedValues.Select(p => p.Value.ToParameterData()).ToList());
             }
 
-            return _result!;
+            return _result;
         }
 
         public void SetParameterDefault(IGenerator generator, ITemplateParameter parameter, IEngineEnvironmentSettings environment, bool useHostDefaults, bool isRequired, List<string> paramsWithInvalidValues)

src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/BindSymbolEvaluator.cs

@@ -112,7 +112,7 @@ private void ProcessEvaluationResults(IVariableCollection variableCollection, IR
                     continue;
                 }
 
-                string obtainedValue = currentTask.Result!;
+                string obtainedValue = currentTask.Result;
                 bool result = ParameterConverter.TryConvertLiteralToDatatype(obtainedValue, currentSymbol.DataType, out object? convertedValue);
                 if (result && convertedValue != null)
                 {

src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/ConfigModel/ParameterSymbol.cs

@@ -196,7 +196,7 @@ private static TemplateParameterPrecedence GetPrecedence(bool isRequired, JObjec
             bool isEnabled = true;
             if (jObject != null && jObject.TryGetValue("IsEnabled", StringComparison.OrdinalIgnoreCase, out JToken? isEnabledToken))
             {
-                if (isEnabledToken!.TryParseBool(out bool enabledConst))
+                if (isEnabledToken.TryParseBool(out bool enabledConst))
                 {
                     isEnabled = enabledConst;
                 }

src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/Macros/RegexMatchMacroConfig.cs

@@ -30,7 +30,7 @@ internal RegexMatchMacroConfig(RegexMatchMacro macro, IGeneratedSymbolConfig gen
         {
             Source = GetMandatoryParameterValue(generatedSymbolConfig, "source");
             Pattern = GetMandatoryParameterValue(generatedSymbolConfig, "pattern");
-            IsValidRegex(Pattern!, generatedSymbolConfig);
+            IsValidRegex(Pattern, generatedSymbolConfig);
         }
 
         internal string Source { get; }

src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/OperationConfig/ConditionalOperationOptions.cs

@@ -41,7 +41,7 @@ internal static ConditionalOperationOptions FromJObject(JObject rawConfiguration
             string? id = rawConfiguration.ToString("id");
             if (!string.IsNullOrWhiteSpace(id))
             {
-                options.Id = id!;
+                options.Id = id;
             }
 
             return options;

src/Microsoft.TemplateEngine.Utils/DictionaryExtensions.cs

@@ -85,7 +85,7 @@ public static bool TryAdd<TKey, TValue>(this IDictionary<TKey, TValue> dict, TKe
         {
             if (condition(value))
             {
-                dict[key] = value!;
+                dict[key] = value;
                 return true;
             }
 

src/Microsoft.TemplateEngine.Utils/DirectedGraph.cs

@@ -149,7 +149,7 @@ private static Dictionary<T, HashSet<T>> GetDependentsMap(Dictionary<T, HashSet<
             var dependentsMap = vertices.ToDictionary(v => v, v => new HashSet<T>());
             foreach (KeyValuePair<T, HashSet<T>> keyValuePair in dependenciesMap)
             {
-                foreach (T dependency in keyValuePair.Value!)
+                foreach (T dependency in keyValuePair.Value)
                 {
                     _ = dependentsMap[dependency].Add(keyValuePair.Key);
                 }

test/Microsoft.TemplateEngine.Authoring.CLI.IntegrationTests/ExportCommandTests.cs

@@ -244,7 +244,7 @@ private static string GetTestTemplateJsonContent()
             string? thisDir = Path.GetDirectoryName(typeof(ExportCommandTests).Assembly.Location);
             Assert.NotNull(thisDir);
             string templateJsonPath = Path.GetFullPath(Path.Combine(
-                thisDir!,
+                thisDir,
                 "..",
                 "..",
                 "..",

test/Microsoft.TemplateEngine.Edge.UnitTests/LocalizationTests.cs

@@ -166,7 +166,7 @@ private IEngineEnvironmentSettings LoadHostWithLocalizationTemplates(string? loc
             Assert.True(localizedTemplates.Count != 0, "Test template couldn't be loaded.");
             var template = localizedTemplates.FirstOrDefault(t => t.Identity == "TestAssets.TemplateWithLocalization");
             Assert.NotNull(template);
-            localizationTemplate = template!;
+            localizationTemplate = template;
 
             return env;
         }

test/Microsoft.TemplateEngine.Edge.UnitTests/NuGetInstallerTests.cs

@@ -478,7 +478,7 @@ internal async Task Update_CannotUpdateVulnerabilities()
 
             var source = installResult.TemplatePackage as NuGetManagedTemplatePackage;
             Assert.NotNull(source);
-            string oldMountPoint = source!.MountPointUri;
+            string oldMountPoint = source.MountPointUri;
             Assert.True(File.Exists(oldMountPoint));
             UpdateRequest updateRequest = new UpdateRequest(source, "12.0.3");
 

test/Microsoft.TemplateEngine.IDE.IntegrationTests/ConfigurationTests.cs

@@ -16,7 +16,7 @@ internal async Task PhysicalConfigurationTest()
         {
             var userProfileDir = Environment.GetEnvironmentVariable(RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "USERPROFILE" : "HOME");
             Assert.NotNull(userProfileDir);
-            var hostDir = Path.Combine(userProfileDir!, ".templateengine", nameof(PhysicalConfigurationTest).ToString());
+            var hostDir = Path.Combine(userProfileDir, ".templateengine", nameof(PhysicalConfigurationTest).ToString());
             try
             {
                 var builtIns = BuiltInTemplatePackagesProviderFactory.GetComponents(TestTemplatesLocation);
@@ -42,7 +42,7 @@ internal async Task VirtualConfigurationTest()
             string? userProfileDir = Environment.GetEnvironmentVariable(RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "USERPROFILE" : "HOME");
             Assert.NotNull(userProfileDir);
 
-            string baseDir = Path.Combine(userProfileDir!, ".templateengine");
+            string baseDir = Path.Combine(userProfileDir, ".templateengine");
             var hostDir = Path.Combine(baseDir, nameof(VirtualConfigurationTest).ToString());
 
             var builtIns = BuiltInTemplatePackagesProviderFactory.GetComponents(TestTemplatesLocation);
@@ -82,7 +82,7 @@ internal async Task PhysicalConfigurationTest_WithChangedHostLocation()
         {
             var userProfileDir = Environment.GetEnvironmentVariable(RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "USERPROFILE" : "HOME");
             Assert.NotNull(userProfileDir);
-            var unexpectedHostDir = Path.Combine(userProfileDir!, ".templateengine", nameof(PhysicalConfigurationTest_WithChangedHostLocation).ToString());
+            var unexpectedHostDir = Path.Combine(userProfileDir, ".templateengine", nameof(PhysicalConfigurationTest_WithChangedHostLocation).ToString());
             var expectedHostDir = TestUtils.CreateTemporaryFolder();
 
             var builtIns = BuiltInTemplatePackagesProviderFactory.GetComponents(TestTemplatesLocation);

test/Microsoft.TemplateEngine.IDE.IntegrationTests/TemplatePackagesTests.cs

@@ -67,7 +67,7 @@ internal async Task CanInstall_LocalNuGetPackage()
 
             IManagedTemplatePackage? source = result[0].TemplatePackage;
             Assert.NotNull(source);
-            Assert.Equal("Microsoft.DotNet.Common.ProjectTemplates.5.0", source!.Identifier);
+            Assert.Equal("Microsoft.DotNet.Common.ProjectTemplates.5.0", source.Identifier);
             Assert.Equal("Global Settings", source.Provider.Factory.DisplayName);
             Assert.Equal("NuGet", source.Installer.Factory.Name);
             Assert.Equal("Microsoft", source.GetDetails()["Author"]);
@@ -107,7 +107,7 @@ internal async Task CanInstall_RemoteNuGetPackage()
 
             IManagedTemplatePackage? source = result[0].TemplatePackage;
             Assert.NotNull(source);
-            Assert.Equal("Take.Blip.Client.Templates", source!.Identifier);
+            Assert.Equal("Take.Blip.Client.Templates", source.Identifier);
             Assert.Equal("Global Settings", source.Provider.Factory.DisplayName);
             Assert.Equal("NuGet", source.Installer.Factory.Name);
             source.GetDetails()["Author"].Should().NotBeNullOrEmpty();
@@ -144,7 +144,7 @@ internal async Task CanInstall_Folder()
 
             IManagedTemplatePackage? source = result[0].TemplatePackage;
             Assert.NotNull(source);
-            Assert.Equal(Path.GetFullPath(templateLocation), source!.Identifier);
+            Assert.Equal(Path.GetFullPath(templateLocation), source.Identifier);
             Assert.Equal("Global Settings", source.Provider.Factory.DisplayName);
             Assert.Equal("Folder", source.Installer.Factory.Name);
             source.Version.Should().BeNullOrEmpty();
@@ -173,7 +173,7 @@ internal async Task CanCheckForLatestVersion_NuGetPackage()
             Assert.True(result[0].Success);
             IManagedTemplatePackage? source = result[0].TemplatePackage;
             Assert.NotNull(source);
-            IReadOnlyList<CheckUpdateResult> checkUpdateResults = await bootstrapper.GetLatestVersionsAsync(new[] { source! }, CancellationToken.None);
+            IReadOnlyList<CheckUpdateResult> checkUpdateResults = await bootstrapper.GetLatestVersionsAsync(new[] { source }, CancellationToken.None);
 
             Assert.Single(checkUpdateResults);
             Assert.True(checkUpdateResults[0].Success);
@@ -198,7 +198,7 @@ internal async Task CanCheckForLatestVersion_Folder()
             Assert.True(result[0].Success);
             IManagedTemplatePackage? source = result[0].TemplatePackage;
             Assert.NotNull(source);
-            IReadOnlyList<CheckUpdateResult> checkUpdateResults = await bootstrapper.GetLatestVersionsAsync(new[] { source! }, CancellationToken.None);
+            IReadOnlyList<CheckUpdateResult> checkUpdateResults = await bootstrapper.GetLatestVersionsAsync(new[] { source }, CancellationToken.None);
 
             Assert.Single(checkUpdateResults);
             Assert.True(checkUpdateResults[0].Success);
@@ -267,7 +267,7 @@ internal async Task CanUpdate_NuGetPackage()
             Assert.True(result[0].Success);
             IManagedTemplatePackage? source = result[0].TemplatePackage;
             Assert.NotNull(source);
-            UpdateRequest updateRequest = new UpdateRequest(source!, "5.0.1");
+            UpdateRequest updateRequest = new UpdateRequest(source, "5.0.1");
 
             IReadOnlyList<UpdateResult> updateResults = await bootstrapper.UpdateTemplatePackagesAsync(new[] { updateRequest }, CancellationToken.None);
 
@@ -279,7 +279,7 @@ internal async Task CanUpdate_NuGetPackage()
 
             IManagedTemplatePackage? updatedSource = updateResults[0].TemplatePackage;
             Assert.NotNull(updatedSource);
-            Assert.Equal("Global Settings", updatedSource!.Provider.Factory.DisplayName);
+            Assert.Equal("Global Settings", updatedSource.Provider.Factory.DisplayName);
             Assert.Equal("NuGet", updatedSource.Installer.Factory.Name);
             Assert.Equal("5.0.1", updatedSource.Version);
 
@@ -312,7 +312,7 @@ internal async Task CanUninstall_NuGetPackage()
             Assert.Single(managedTemplatesPackages);
             managedTemplatesPackages[0].Should().BeEquivalentTo(source);
 
-            IReadOnlyList<UninstallResult> uninstallResults = await bootstrapper.UninstallTemplatePackagesAsync(new[] { source! }, CancellationToken.None);
+            IReadOnlyList<UninstallResult> uninstallResults = await bootstrapper.UninstallTemplatePackagesAsync(new[] { source }, CancellationToken.None);
 
             Assert.Single(uninstallResults);
             Assert.True(uninstallResults[0].Success);
@@ -339,7 +339,7 @@ internal async Task CanUninstall_Folder()
             Assert.True(result[0].Success);
             IManagedTemplatePackage? source = result[0].TemplatePackage;
             Assert.NotNull(source);
-            Assert.Equal(templateLocation, source!.MountPointUri);
+            Assert.Equal(templateLocation, source.MountPointUri);
 
             IReadOnlyList<IManagedTemplatePackage> managedTemplatesPackages = await bootstrapper.GetManagedTemplatePackagesAsync(CancellationToken.None);
 

test/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.UnitTests/MacroTests/GuidMacroTests.cs

@@ -62,15 +62,15 @@ private static void ValidateGuidMacroCreatedParametersWithResolvedValues(string
         {
             Assert.True(variables.ContainsKey(variableName));
             Assert.NotNull(variables[variableName]);
-            Guid paramValue = Guid.Parse((string)variables[variableName]!);
+            Guid paramValue = Guid.Parse((string)variables[variableName]);
 
             // check that all the param name variants were created, and their values all resolve to the same guid.
             string guidFormats = GuidMacroConfig.DefaultFormats;
             for (int i = 0; i < guidFormats.Length; ++i)
             {
                 string otherFormatVariableName = variableName + "-" + guidFormats[i];
                 Assert.NotNull(variables[otherFormatVariableName]);
-                Guid testValue = Guid.Parse((string)variables[otherFormatVariableName]!);
+                Guid testValue = Guid.Parse((string)variables[otherFormatVariableName]);
                 Assert.Equal(paramValue, testValue);
 
                 // Test the new formats - that distinguish upper and lower case by tags that are
@@ -80,8 +80,8 @@ private static void ValidateGuidMacroCreatedParametersWithResolvedValues(string
                     (char.IsUpper(guidFormats[i]) ? GuidMacroConfig.UpperCaseDenominator : GuidMacroConfig.LowerCaseDenominator) +
                     guidFormats[i];
 
-                string resolvedValue = (string)variables[otherFormatVariableName]!;
-                testValue = Guid.Parse((string)variables[otherFormatVariableName]!);
+                string resolvedValue = (string)variables[otherFormatVariableName];
+                testValue = Guid.Parse((string)variables[otherFormatVariableName]);
                 Assert.Equal(paramValue, testValue);
                 Assert.Equal(char.IsUpper(guidFormats[i]), char.IsUpper(resolvedValue.First(char.IsLetter)));
             }