[Recursive sync] sdk / 4640396 → 5c6deb8

dotnet-maestro[bot] · dotnet-maestro[bot] · commit 0f7a4879bc43 · 2025-05-05T14:23:48.000Z
Updated repositories: - sdk / 4640396 → 5c6deb8 https://github.com/dotnet/sdk/compare/46403964a083e9e9a288d181261c714cfd835110..5c6deb8c2a14f481768b1d2a32372052841213b8 [[ commit created by automation ]]
diff --git a/prereqs/git-info/sdk.props b/prereqs/git-info/sdk.props
@@ -1,8 +1,8 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <Project>
   <PropertyGroup>
-    <GitCommitHash>46403964a083e9e9a288d181261c714cfd835110</GitCommitHash>
-    <OfficialBuildId>20250502.1</OfficialBuildId>
+    <GitCommitHash>5c6deb8c2a14f481768b1d2a32372052841213b8</GitCommitHash>
+    <OfficialBuildId>20250505.1</OfficialBuildId>
     <OutputPackageVersion>0.0.0</OutputPackageVersion>
   </PropertyGroup>
 </Project>
diff --git a/src/sdk/src/Layout/pkg/dotnet-sdk.proj b/src/sdk/src/Layout/pkg/dotnet-sdk.proj
@@ -26,15 +26,13 @@
     -->
     <InstallerRuntimeIdentifiers>linux-$(TargetArchitecture)</InstallerRuntimeIdentifiers>
     <IsShippingPackage>true</IsShippingPackage>
-  </PropertyGroup>
-
-  <ItemGroup>
     <!-- The PublishToDisk target which depends on ResolveProjectReferences is invoked with OutputPath as an global property
-         which would flow to redist.csproj. -->
-    <ProjectReference Include="..\redist\redist.csproj" ReferenceOutputAssembly="false" GlobalPropertiesToRemove="OutputPath" />
-  </ItemGroup>
+         which would flow to redist.csproj or sdk-tasks.csproj. -->
+    <_GlobalPropertiesToRemoveFromProjectReferences>$(_GlobalPropertiesToRemoveFromProjectReferences);OutputPath</_GlobalPropertiesToRemoveFromProjectReferences>
+  </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\redist\redist.csproj" ReferenceOutputAssembly="false" />
     <PackageReference Include="Microsoft.DotNet.Build.Tasks.Installers" />
   </ItemGroup>
 
diff --git a/src/source-manifest.json b/src/source-manifest.json
@@ -124,7 +124,7 @@
       "barId": null,
       "path": "sdk",
       "remoteUri": "https://github.com/dotnet/sdk",
-      "commitSha": "46403964a083e9e9a288d181261c714cfd835110"
+      "commitSha": "5c6deb8c2a14f481768b1d2a32372052841213b8"
     },
     {
       "packageVersion": "10.0.622101",

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@`
`124`	`124`	`"barId": null,`
`125`	`125`	`"path": "sdk",`
`126`	`126`	`"remoteUri": "https://github.com/dotnet/sdk",`
`127`		`- "commitSha": "46403964a083e9e9a288d181261c714cfd835110"`
	`127`	`+ "commitSha": "5c6deb8c2a14f481768b1d2a32372052841213b8"`
`128`	`128`	`},`
`129`	`129`	`{`
`130`	`130`	`"packageVersion": "10.0.622101",`