Skip to content

Commit 1c30b4a

Browse files
author
Jason Zhai
committed
Merge branch 'main' of https://github.com/dotnet/sdk into darc-main-26aa4942-a6c0-4e7b-acf1-23d2f2754110
2 parents eef6bdc + 28d5664 commit 1c30b4a

File tree

12 files changed

+60
-29
lines changed

12 files changed

+60
-29
lines changed

‎eng/Version.Details.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -597,34 +597,34 @@
597597
</Dependency>
598598
</ProductDependencies>
599599
<ToolsetDependencies>
600-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24511.1">
600+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24514.3">
601601
<Uri>https://github.com/dotnet/arcade</Uri>
602-
<Sha>712dea25b14a59fe642f2d28e8a3f3c931c03759</Sha>
602+
<Sha>964e434191bd3ca5675743d08ff742ec0f1e79a9</Sha>
603603
</Dependency>
604-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.24511.1">
604+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.24514.3">
605605
<Uri>https://github.com/dotnet/arcade</Uri>
606-
<Sha>712dea25b14a59fe642f2d28e8a3f3c931c03759</Sha>
606+
<Sha>964e434191bd3ca5675743d08ff742ec0f1e79a9</Sha>
607607
</Dependency>
608-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24511.1">
608+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24514.3">
609609
<Uri>https://github.com/dotnet/arcade</Uri>
610-
<Sha>712dea25b14a59fe642f2d28e8a3f3c931c03759</Sha>
610+
<Sha>964e434191bd3ca5675743d08ff742ec0f1e79a9</Sha>
611611
</Dependency>
612-
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.24511.1">
612+
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.24514.3">
613613
<Uri>https://github.com/dotnet/arcade</Uri>
614-
<Sha>712dea25b14a59fe642f2d28e8a3f3c931c03759</Sha>
614+
<Sha>964e434191bd3ca5675743d08ff742ec0f1e79a9</Sha>
615615
</Dependency>
616-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.24511.1">
616+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.24514.3">
617617
<Uri>https://github.com/dotnet/arcade</Uri>
618-
<Sha>712dea25b14a59fe642f2d28e8a3f3c931c03759</Sha>
618+
<Sha>964e434191bd3ca5675743d08ff742ec0f1e79a9</Sha>
619619
</Dependency>
620-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.24511.1">
620+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.24514.3">
621621
<Uri>https://github.com/dotnet/arcade</Uri>
622-
<Sha>712dea25b14a59fe642f2d28e8a3f3c931c03759</Sha>
622+
<Sha>964e434191bd3ca5675743d08ff742ec0f1e79a9</Sha>
623623
</Dependency>
624624
<!-- Intermediate is necessary for source build. -->
625-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24511.1">
625+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24514.3">
626626
<Uri>https://github.com/dotnet/arcade</Uri>
627-
<Sha>712dea25b14a59fe642f2d28e8a3f3c931c03759</Sha>
627+
<Sha>964e434191bd3ca5675743d08ff742ec0f1e79a9</Sha>
628628
<SourceBuild RepoName="arcade" ManagedOnly="true" />
629629
</Dependency>
630630
<!-- Temporarily pinned to a net9 supporting version until the SDK can target net10.

‎eng/Versions.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -324,10 +324,10 @@
324324
</PropertyGroup>
325325
<PropertyGroup>
326326
<!-- Dependencies from https://github.com/dotnet/arcade -->
327-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.24511.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
328-
<MicrosoftDotNetSignToolVersion>10.0.0-beta.24511.1</MicrosoftDotNetSignToolVersion>
329-
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.24511.1</MicrosoftDotNetXliffTasksVersion>
330-
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.24511.1</MicrosoftDotNetXUnitExtensionsVersion>
327+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.24514.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
328+
<MicrosoftDotNetSignToolVersion>10.0.0-beta.24514.3</MicrosoftDotNetSignToolVersion>
329+
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.24514.3</MicrosoftDotNetXliffTasksVersion>
330+
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.24514.3</MicrosoftDotNetXUnitExtensionsVersion>
331331
</PropertyGroup>
332332
<PropertyGroup>
333333
<!-- Dependencies from https://github.com/dotnet/sourcelink -->

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"cmake": "latest"
1818
},
1919
"msbuild-sdks": {
20-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24511.1",
21-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24511.1",
20+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24514.3",
21+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24514.3",
2222
"Microsoft.Build.NoTargets": "3.7.0",
2323
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
2424
}

‎src/Cli/Microsoft.TemplateEngine.Cli/Commands/CliPathInfo.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ private static string GetUserProfileDir(IEnvironment environment) => environment
4242
RuntimeInformation.IsOSPlatform(OSPlatform.Windows)
4343
? "USERPROFILE"
4444
: "HOME")
45+
?? Environment.GetFolderPath(Environment.SpecialFolder.UserProfile)
4546
?? throw new NotSupportedException("HOME or USERPROFILE environment variable is not defined, the environment is not supported");
4647

4748
private static string GetGlobalSettingsDir(string? settingsLocation)

‎src/RazorSdk/Tool/ServerProtocol/ServerConnection.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public static string GetTempPath(string workingDir)
7777
}
7878
}
7979

80-
var userProfile = Environment.GetEnvironmentVariable("USERPROFILE");
80+
var userProfile = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
8181
if (Path.IsPathRooted(userProfile))
8282
{
8383
return userProfile;

‎src/SourceBuild/content/eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<ProductDependencies>
33
</ProductDependencies>
44
<ToolsetDependencies>
5-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24510.2">
5+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24514.3">
66
<Uri>https://github.com/dotnet/arcade</Uri>
7-
<Sha>47bbcb142acb3fa258d204862114a72e085dd788</Sha>
7+
<Sha>964e434191bd3ca5675743d08ff742ec0f1e79a9</Sha>
88
</Dependency>
99
</ToolsetDependencies>
1010
</Dependencies>

‎src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/UpdateNuGetConfigPackageSourcesMappings.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,11 +207,15 @@ private void AddSourceMappings(XElement pkgSrcMappingElement, string sourceName,
207207
{
208208
pkgSrc = existingPkgSrcElement;
209209
}
210-
else
210+
else if (packagePatterns.Count > 0)
211211
{
212212
pkgSrc = new XElement("packageSource", new XAttribute("key", sourceName));
213213
pkgSrcMappingElement.Add(pkgSrc);
214214
}
215+
else
216+
{
217+
return;
218+
}
215219

216220
foreach (string packagePattern in packagePatterns)
217221
{

‎src/SourceBuild/content/global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
"msbuild-sdks": {
66
"Microsoft.Build.NoTargets": "3.7.0",
77
"Microsoft.Build.Traversal": "3.4.0",
8-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24510.2"
8+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24514.3"
99
}
1010
}

‎src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SdkContentTests.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,11 @@ private void RemoveExcludedAssemblyVersionPaths(Dictionary<string, Version?> sbS
9898
{
9999
string assemblyPath = sbSdkFileArray[i];
100100
Version? sbVersion = sbSdkAssemblyVersions[assemblyPath];
101-
Version? msftVersion = msftSdkAssemblyVersions[assemblyPath];
101+
if (!msftSdkAssemblyVersions.TryGetValue(assemblyPath, out Version? msftVersion))
102+
{
103+
sbSdkAssemblyVersions.Remove(assemblyPath);
104+
continue;
105+
}
102106

103107
if (sbVersion is not null &&
104108
msftVersion is not null &&

‎src/SourceBuild/patches/msbuild/0001-remove-buildxl-feed.patch

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
From 3e953b23493f51d58d20b154e4fb13e8a144168a Mon Sep 17 00:00:00 2001
2+
From: Jan Krivanek <[email protected]>
3+
Date: Tue, 8 Oct 2024 08:08:29 +0200
4+
Subject: [PATCH] Remove BuildXL feed
5+
6+
Backport: https://github.com/dotnet/msbuild/pull/10765
7+
8+
---
9+
NuGet.config | 1 -
10+
1 file changed, 1 deletion(-)
11+
12+
diff --git a/NuGet.config b/NuGet.config
13+
index 17cb1b80c05..659ab421680 100644
14+
--- a/NuGet.config
15+
+++ b/NuGet.config
16+
@@ -18,7 +18,6 @@
17+
<add key="dotnet8" value="https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet8/nuget/v3/index.json" />
18+
<add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
19+
<add key="dotnet9" value="https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet9/nuget/v3/index.json" />
20+
- <add key="BuildXL" value="https://pkgs.dev.azure.com/ms/BuildXL/_packaging/BuildXL/nuget/v3/index.json" />
21+
<add key="msbuild17.12" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-95c7bf01-1/nuget/v3/index.json" />
22+
</packageSources>
23+
<disabledPackageSources>

0 commit comments

Comments
 (0)