Bump to dotnet/installer@7a5b36b 6.0.400-rtm.22364.21 (#7164)

Changes: dotnet/installer@c671341...7a5b36b Updates: Microsoft.Dotnet.Sdk.Internal: from 6.0.400-preview.22356.7 to 6.0.400-rtm.22364.21 Workarounds for: dotnet/sdk#26627 Remove leading spaces from response file to fix: MSBUILD : error MSB1008: Only one project can be specified. Remove *trailing* spaces from response file to fix the space being included in the property. Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>
dotnet · Jul 19, 2022 · f6ba44c · f6ba44c
1 parent d267a4f
commit f6ba44c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/NuGet.config b/NuGet.config
@@ -6,7 +6,6 @@
     <!--  Begin: Package sources from dotnet-emsdk -->
     <!--  End: Package sources from dotnet-emsdk -->
     <!--  Begin: Package sources from dotnet-runtime -->
-    <add key="darc-pub-dotnet-runtime-705ec75" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-705ec75f/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <!-- ensure only the sources defined below are used -->

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -1,8 +1,8 @@
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.400-preview.22356.7">
+    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.400-rtm.22364.21">
       <Uri>https://github.com/dotnet/installer</Uri>
-      <Sha>c671341ee86ecdafde8791709c37487e3e377ca8</Sha>
+      <Sha>7a5b36b4a4b0c72f2e14dfb4e950e2c118a4f346</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.200-1.22219.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/dotnet/linker</Uri>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -1,7 +1,7 @@
 <Project>
   <!--Package versions-->
   <PropertyGroup>
-    <MicrosoftDotnetSdkInternalPackageVersion>6.0.400-preview.22356.7</MicrosoftDotnetSdkInternalPackageVersion>
+    <MicrosoftDotnetSdkInternalPackageVersion>6.0.400-rtm.22364.21</MicrosoftDotnetSdkInternalPackageVersion>
     <MicrosoftNETILLinkTasksPackageVersion>6.0.200-1.22219.3</MicrosoftNETILLinkTasksPackageVersion>
     <MicrosoftNETCoreAppRefPackageVersion>6.0.7</MicrosoftNETCoreAppRefPackageVersion>
     <MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>

diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/Builder.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/Builder.cs
@@ -305,21 +305,21 @@ protected bool BuildInternal (string projectOrSolution, string target, string []
 			}
 			args.Append ($" @\"{responseFile}\"");
 			using (var sw = new StreamWriter (responseFile, append: false, encoding: Encoding.UTF8)) {
-				sw.WriteLine ($" /p:BuildingInsideVisualStudio={BuildingInsideVisualStudio}");
+				sw.WriteLine ($"/p:BuildingInsideVisualStudio={BuildingInsideVisualStudio}");
 				if (BuildingInsideVisualStudio) {
-					sw.WriteLine (" /p:BuildingOutOfProcess=true");
+					sw.WriteLine ("/p:BuildingOutOfProcess=true");
 				}
 				string sdkPath = AndroidSdkResolver.GetAndroidSdkPath ();
 				if (Directory.Exists (sdkPath)) {
-					sw.WriteLine (" /p:AndroidSdkDirectory=\"{0}\" ", sdkPath);
+					sw.WriteLine ("/p:AndroidSdkDirectory=\"{0}\"", sdkPath);
 				}
 				string jdkPath = AndroidSdkResolver.GetJavaSdkPath ();
 				if (Directory.Exists (jdkPath)) {
-					sw.WriteLine (" /p:JavaSdkDirectory=\"{0}\" ", jdkPath);
+					sw.WriteLine ("/p:JavaSdkDirectory=\"{0}\"", jdkPath);
 				}
 				if (parameters != null) {
 					foreach (var param in parameters) {
-						sw.WriteLine (" /p:{0}", param);
+						sw.WriteLine ("/p:{0}", param);
 					}
 				}
 				var msbuildArgs = Environment.GetEnvironmentVariable ("NUNIT_MSBUILD_ARGS");
@@ -328,7 +328,7 @@ protected bool BuildInternal (string projectOrSolution, string target, string []
 				}
 
 				psi.SetEnvironmentVariable ("MSBUILD", "msbuild");
-				sw.WriteLine ($" /bl:\"{Path.GetFullPath (Path.Combine (XABuildPaths.TestOutputDirectory, Path.GetDirectoryName (projectOrSolution), "msbuild.binlog"))}\"");
+				sw.WriteLine ($"/bl:\"{Path.GetFullPath (Path.Combine (XABuildPaths.TestOutputDirectory, Path.GetDirectoryName (projectOrSolution), "msbuild.binlog"))}\"");
 
 				if (environmentVariables != null) {
 					foreach (var kvp in environmentVariables) {