Skip to content

Commit ef39dad

Browse files
committed
Merge remote-tracking branch 'upstream/release/6.0' into internal/release/6.0
2 parents 551792a + f228884 commit ef39dad

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

eng/Version.Details.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@
4949
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
5050
<Sha>a08d9ce2caf02455c0b825bcdc32974bdf769a80</Sha>
5151
</Dependency>
52-
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="6.0.0-rtm.23516.3">
52+
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="6.0.0-rtm.23572.3">
5353
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
54-
<Sha>b28a2aad515e30baaa1bf8c4e98414086de24b76</Sha>
54+
<Sha>4e9fd815d72fa267bfa5fb21e1304501df1d2f50</Sha>
5555
</Dependency>
5656
<Dependency Name="System.IO.Packaging" Version="6.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
5757
<Uri>https://github.com/dotnet/runtime</Uri>
@@ -83,25 +83,25 @@
8383
</Dependency>
8484
</ProductDependencies>
8585
<ToolsetDependencies>
86-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.23511.8">
86+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.23517.3">
8787
<Uri>https://github.com/dotnet/arcade</Uri>
88-
<Sha>06ccd9430e2e3bd29a381a5b27e7976d11b0ed18</Sha>
88+
<Sha>7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c</Sha>
8989
</Dependency>
90-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.23511.8">
90+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.23517.3">
9191
<Uri>https://github.com/dotnet/arcade</Uri>
92-
<Sha>06ccd9430e2e3bd29a381a5b27e7976d11b0ed18</Sha>
92+
<Sha>7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c</Sha>
9393
</Dependency>
94-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.23511.8">
94+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.23517.3">
9595
<Uri>https://github.com/dotnet/arcade</Uri>
96-
<Sha>06ccd9430e2e3bd29a381a5b27e7976d11b0ed18</Sha>
96+
<Sha>7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c</Sha>
9797
</Dependency>
98-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.23511.8">
98+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.23517.3">
9999
<Uri>https://github.com/dotnet/arcade</Uri>
100-
<Sha>06ccd9430e2e3bd29a381a5b27e7976d11b0ed18</Sha>
100+
<Sha>7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c</Sha>
101101
</Dependency>
102-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.23511.8">
102+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.23517.3">
103103
<Uri>https://github.com/dotnet/arcade</Uri>
104-
<Sha>06ccd9430e2e3bd29a381a5b27e7976d11b0ed18</Sha>
104+
<Sha>7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c</Sha>
105105
</Dependency>
106106
</ToolsetDependencies>
107107
</Dependencies>

eng/Versions.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@
5656
</PropertyGroup>
5757
<!-- Packages that come from https://github.com/dotnet/arcade -->
5858
<PropertyGroup>
59-
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.23511.8</MicrosoftDotNetApiCompatVersion>
60-
<MicrosoftDotNetCodeAnalysisPackageVersion>6.0.0-beta.23511.8</MicrosoftDotNetCodeAnalysisPackageVersion>
61-
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.23511.8</MicrosoftDotNetGenAPIVersion>
59+
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.23517.3</MicrosoftDotNetApiCompatVersion>
60+
<MicrosoftDotNetCodeAnalysisPackageVersion>6.0.0-beta.23517.3</MicrosoftDotNetCodeAnalysisPackageVersion>
61+
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.23517.3</MicrosoftDotNetGenAPIVersion>
6262
</PropertyGroup>
6363
<!-- Maintain System.CodeDom PackageVersion at 4.4.0. See https://github.com/Microsoft/msbuild/issues/3627 -->
6464
<!-- Pin specific versions of S.Memory so that it would supply AssemblyVersion=4.0.1.0. See https://github.com/dotnet/runtime/issues/31672 -->
@@ -97,6 +97,6 @@
9797
<SystemReflectionMetadataLoadContextPackage>System.Reflection.MetadataLoadContext</SystemReflectionMetadataLoadContextPackage>
9898
</PropertyGroup>
9999
<PropertyGroup>
100-
<MicrosoftDotNetWpfDncEngVersion>6.0.0-rtm.23516.3</MicrosoftDotNetWpfDncEngVersion>
100+
<MicrosoftDotNetWpfDncEngVersion>6.0.0-rtm.23572.3</MicrosoftDotNetWpfDncEngVersion>
101101
</PropertyGroup>
102102
</Project>

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
}
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23511.8",
16-
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23511.8"
15+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23517.3",
16+
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23517.3"
1717
},
1818
"sdk": {
1919
"version": "6.0.123"

0 commit comments

Comments
 (0)