Skip to content

Commit ed655b4

Browse files
vseanreesermsftvseanreesermsft
committed
Merged PR 35639: [internal/release/6.0] Merge from public
Merge from public release/6.0 to internal/release/6.0 and resolve conflicts if necessary
2 parents 00f7c0e + 1450cae commit ed655b4

File tree

8 files changed

+20
-14
lines changed

8 files changed

+20
-14
lines changed

‎eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -280,22 +280,22 @@
280280
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
281281
<Sha>0545d9fd7d80e0e8eaaff87aa0011ad5bc13fcc8</Sha>
282282
</Dependency>
283-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.23511.8">
283+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.23517.3">
284284
<Uri>https://github.com/dotnet/arcade</Uri>
285-
<Sha>06ccd9430e2e3bd29a381a5b27e7976d11b0ed18</Sha>
285+
<Sha>7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c</Sha>
286286
<SourceBuild RepoName="arcade" ManagedOnly="true" />
287287
</Dependency>
288-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.23511.8">
288+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.23517.3">
289289
<Uri>https://github.com/dotnet/arcade</Uri>
290-
<Sha>06ccd9430e2e3bd29a381a5b27e7976d11b0ed18</Sha>
290+
<Sha>7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c</Sha>
291291
</Dependency>
292-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.23511.8">
292+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.23517.3">
293293
<Uri>https://github.com/dotnet/arcade</Uri>
294-
<Sha>06ccd9430e2e3bd29a381a5b27e7976d11b0ed18</Sha>
294+
<Sha>7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c</Sha>
295295
</Dependency>
296-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.23511.8">
296+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.23517.3">
297297
<Uri>https://github.com/dotnet/arcade</Uri>
298-
<Sha>06ccd9430e2e3bd29a381a5b27e7976d11b0ed18</Sha>
298+
<Sha>7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c</Sha>
299299
</Dependency>
300300
</ToolsetDependencies>
301301
</Dependencies>

‎eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@
131131
<MicrosoftEntityFrameworkCoreVersion>6.0.26</MicrosoftEntityFrameworkCoreVersion>
132132
<MicrosoftEntityFrameworkCoreDesignVersion>6.0.26</MicrosoftEntityFrameworkCoreDesignVersion>
133133
<!-- Packages from dotnet/arcade -->
134-
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.23511.8</MicrosoftDotNetBuildTasksInstallersVersion>
135-
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.23511.8</MicrosoftDotNetBuildTasksTemplatingVersion>
134+
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.23517.3</MicrosoftDotNetBuildTasksInstallersVersion>
135+
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.23517.3</MicrosoftDotNetBuildTasksTemplatingVersion>
136136
</PropertyGroup>
137137
<!--
138138

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
},
3030
"msbuild-sdks": {
3131
"Yarn.MSBuild": "1.22.10",
32-
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23511.8",
33-
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23511.8"
32+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23517.3",
33+
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23517.3"
3434
}
3535
}

‎src/Components/WebView/Samples/PhotinoPlatform/testassets/PhotinoTestApp/PhotinoTestApp.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<SignAssembly>false</SignAssembly>
88
</PropertyGroup>
99

10-
<Import Project="..\..\..\..\WebView\src\buildTransitive\any\Microsoft.AspNetCore.Components.WebView.props" />
10+
<Import Project="..\..\..\..\WebView\src\buildTransitive\Microsoft.AspNetCore.Components.WebView.props" />
1111

1212
<ItemGroup>
1313
<ProjectReference Include="..\..\src\Microsoft.AspNetCore.Components.WebView.Photino.csproj" />

‎src/Components/WebView/WebView/src/Microsoft.AspNetCore.Components.WebView.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
</ItemGroup>
3434

3535
<ItemGroup>
36-
<None Include="buildTransitive\any\Microsoft.AspNetCore.Components.WebView.props" Pack="true" PackagePath="%(Identity)" />
36+
<None Include="buildTransitive\Microsoft.AspNetCore.Components.WebView.props" Pack="true" PackagePath="%(Identity)" />
3737
</ItemGroup>
3838

3939
<ItemGroup>

‎src/Components/WebView/WebView/src/buildTransitive/any/Microsoft.AspNetCore.Components.WebView.props renamed to ‎src/Components/WebView/WebView/src/build/Microsoft.AspNetCore.Components.WebView.props

File renamed without changes.

‎src/Components/WebView/WebView/src/buildMultiTargeting/Microsoft.AspNetCore.Components.WebView.props

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<Project>
2+
<Import Project="..\build\Microsoft.AspNetCore.Components.WebView.props" />
3+
</Project>

‎src/Components/WebView/WebView/src/buildTransitive/Microsoft.AspNetCore.Components.WebView.props

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<Project>
2+
<Import Project="..\build\Microsoft.AspNetCore.Components.WebView.props" />
3+
</Project>

0 commit comments

Comments
 (0)