Skip to content

Commit f6ba44c

Browse files
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>
1 parent d267a4f commit f6ba44c

File tree

4 files changed

+9
-10
lines changed

4 files changed

+9
-10
lines changed

NuGet.config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<!-- Begin: Package sources from dotnet-emsdk -->
77
<!-- End: Package sources from dotnet-emsdk -->
88
<!-- Begin: Package sources from dotnet-runtime -->
9-
<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" />
109
<!-- End: Package sources from dotnet-runtime -->
1110
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1211
<!-- ensure only the sources defined below are used -->

eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.400-preview.22356.7">
3+
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.400-rtm.22364.21">
44
<Uri>https://github.com/dotnet/installer</Uri>
5-
<Sha>c671341ee86ecdafde8791709c37487e3e377ca8</Sha>
5+
<Sha>7a5b36b4a4b0c72f2e14dfb4e950e2c118a4f346</Sha>
66
</Dependency>
77
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.200-1.22219.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
88
<Uri>https://github.com/dotnet/linker</Uri>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22
<!--Package versions-->
33
<PropertyGroup>
4-
<MicrosoftDotnetSdkInternalPackageVersion>6.0.400-preview.22356.7</MicrosoftDotnetSdkInternalPackageVersion>
4+
<MicrosoftDotnetSdkInternalPackageVersion>6.0.400-rtm.22364.21</MicrosoftDotnetSdkInternalPackageVersion>
55
<MicrosoftNETILLinkTasksPackageVersion>6.0.200-1.22219.3</MicrosoftNETILLinkTasksPackageVersion>
66
<MicrosoftNETCoreAppRefPackageVersion>6.0.7</MicrosoftNETCoreAppRefPackageVersion>
77
<MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/Builder.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -305,21 +305,21 @@ protected bool BuildInternal (string projectOrSolution, string target, string []
305305
}
306306
args.Append ($" @\"{responseFile}\"");
307307
using (var sw = new StreamWriter (responseFile, append: false, encoding: Encoding.UTF8)) {
308-
sw.WriteLine ($" /p:BuildingInsideVisualStudio={BuildingInsideVisualStudio}");
308+
sw.WriteLine ($"/p:BuildingInsideVisualStudio={BuildingInsideVisualStudio}");
309309
if (BuildingInsideVisualStudio) {
310-
sw.WriteLine (" /p:BuildingOutOfProcess=true");
310+
sw.WriteLine ("/p:BuildingOutOfProcess=true");
311311
}
312312
string sdkPath = AndroidSdkResolver.GetAndroidSdkPath ();
313313
if (Directory.Exists (sdkPath)) {
314-
sw.WriteLine (" /p:AndroidSdkDirectory=\"{0}\" ", sdkPath);
314+
sw.WriteLine ("/p:AndroidSdkDirectory=\"{0}\"", sdkPath);
315315
}
316316
string jdkPath = AndroidSdkResolver.GetJavaSdkPath ();
317317
if (Directory.Exists (jdkPath)) {
318-
sw.WriteLine (" /p:JavaSdkDirectory=\"{0}\" ", jdkPath);
318+
sw.WriteLine ("/p:JavaSdkDirectory=\"{0}\"", jdkPath);
319319
}
320320
if (parameters != null) {
321321
foreach (var param in parameters) {
322-
sw.WriteLine (" /p:{0}", param);
322+
sw.WriteLine ("/p:{0}", param);
323323
}
324324
}
325325
var msbuildArgs = Environment.GetEnvironmentVariable ("NUNIT_MSBUILD_ARGS");
@@ -328,7 +328,7 @@ protected bool BuildInternal (string projectOrSolution, string target, string []
328328
}
329329

330330
psi.SetEnvironmentVariable ("MSBUILD", "msbuild");
331-
sw.WriteLine ($" /bl:\"{Path.GetFullPath (Path.Combine (XABuildPaths.TestOutputDirectory, Path.GetDirectoryName (projectOrSolution), "msbuild.binlog"))}\"");
331+
sw.WriteLine ($"/bl:\"{Path.GetFullPath (Path.Combine (XABuildPaths.TestOutputDirectory, Path.GetDirectoryName (projectOrSolution), "msbuild.binlog"))}\"");
332332

333333
if (environmentVariables != null) {
334334
foreach (var kvp in environmentVariables) {

0 commit comments

Comments
 (0)