Skip to content

Commit 65b9f73

Browse files
dotnet-botdotnet-bot
committed
Merge in 'release/7.0' changes
2 parents 9bc7990 + d54a991 commit 65b9f73

File tree

3 files changed

+46
-46
lines changed

3 files changed

+46
-46
lines changed

‎eng/Version.Details.xml

+41-41
Original file line numberDiff line numberDiff line change
@@ -10,90 +10,90 @@
1010
<Sha>672cc8c705697af4146629537abebcd483963375</Sha>
1111
</Dependency>
1212
<Dependency Name="System.CodeDom" Version="7.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
13-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
14-
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
13+
<Uri>https://github.com/dotnet/runtime</Uri>
14+
<Sha>075e74ed1356f2e5bb978ac541633ab46e34bf99</Sha>
1515
</Dependency>
1616
<Dependency Name="System.Configuration.ConfigurationManager" Version="7.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
17-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
18-
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
17+
<Uri>https://github.com/dotnet/runtime</Uri>
18+
<Sha>075e74ed1356f2e5bb978ac541633ab46e34bf99</Sha>
1919
</Dependency>
2020
<Dependency Name="System.Diagnostics.EventLog" Version="7.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
21-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
22-
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
21+
<Uri>https://github.com/dotnet/runtime</Uri>
22+
<Sha>075e74ed1356f2e5bb978ac541633ab46e34bf99</Sha>
2323
</Dependency>
2424
<Dependency Name="System.DirectoryServices" Version="7.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
25-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
26-
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
25+
<Uri>https://github.com/dotnet/runtime</Uri>
26+
<Sha>075e74ed1356f2e5bb978ac541633ab46e34bf99</Sha>
2727
</Dependency>
2828
<Dependency Name="System.Drawing.Common" Version="7.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
29-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
30-
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
29+
<Uri>https://github.com/dotnet/runtime</Uri>
30+
<Sha>075e74ed1356f2e5bb978ac541633ab46e34bf99</Sha>
3131
</Dependency>
3232
<Dependency Name="System.Reflection.MetadataLoadContext" Version="7.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
33-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
34-
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
33+
<Uri>https://github.com/dotnet/runtime</Uri>
34+
<Sha>075e74ed1356f2e5bb978ac541633ab46e34bf99</Sha>
3535
</Dependency>
3636
<Dependency Name="System.Security.Cryptography.Xml" Version="7.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
37-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
38-
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
37+
<Uri>https://github.com/dotnet/runtime</Uri>
38+
<Sha>075e74ed1356f2e5bb978ac541633ab46e34bf99</Sha>
3939
</Dependency>
4040
<Dependency Name="System.Security.Permissions" Version="7.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
41-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
42-
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
41+
<Uri>https://github.com/dotnet/runtime</Uri>
42+
<Sha>075e74ed1356f2e5bb978ac541633ab46e34bf99</Sha>
4343
</Dependency>
4444
<Dependency Name="System.Windows.Extensions" Version="7.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
45-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
46-
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
45+
<Uri>https://github.com/dotnet/runtime</Uri>
46+
<Sha>075e74ed1356f2e5bb978ac541633ab46e34bf99</Sha>
4747
</Dependency>
4848
<Dependency Name="Microsoft.NETCore.Platforms" Version="7.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
49-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
50-
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
49+
<Uri>https://github.com/dotnet/runtime</Uri>
50+
<Sha>075e74ed1356f2e5bb978ac541633ab46e34bf99</Sha>
5151
</Dependency>
5252
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="7.0.0-rtm.22506.6">
5353
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
5454
<Sha>00c647d63646ecc287c92f64734f438557f4a813</Sha>
5555
</Dependency>
5656
<Dependency Name="System.IO.Packaging" Version="7.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
57-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
58-
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
57+
<Uri>https://github.com/dotnet/runtime</Uri>
58+
<Sha>075e74ed1356f2e5bb978ac541633ab46e34bf99</Sha>
5959
</Dependency>
6060
<Dependency Name="System.Resources.Extensions" Version="7.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
61-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
62-
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
61+
<Uri>https://github.com/dotnet/runtime</Uri>
62+
<Sha>075e74ed1356f2e5bb978ac541633ab46e34bf99</Sha>
6363
</Dependency>
6464
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
65-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
66-
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
65+
<Uri>https://github.com/dotnet/runtime</Uri>
66+
<Sha>075e74ed1356f2e5bb978ac541633ab46e34bf99</Sha>
6767
</Dependency>
6868
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
69-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
70-
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
69+
<Uri>https://github.com/dotnet/runtime</Uri>
70+
<Sha>075e74ed1356f2e5bb978ac541633ab46e34bf99</Sha>
7171
</Dependency>
72-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.0-rtm.22518.5" CoherentParentDependency="Microsoft.Private.Winforms">
73-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
74-
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
72+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.0-rtm.22513.5" CoherentParentDependency="Microsoft.Private.Winforms">
73+
<Uri>https://github.com/dotnet/runtime</Uri>
74+
<Sha>075e74ed1356f2e5bb978ac541633ab46e34bf99</Sha>
7575
</Dependency>
7676
</ProductDependencies>
7777
<ToolsetDependencies>
78-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22558.4">
78+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22561.2">
7979
<Uri>https://github.com/dotnet/arcade</Uri>
80-
<Sha>3f3c360819c5c092d0e4505a67dfe59a33fba557</Sha>
80+
<Sha>f36ea231c234560514ede4c2747897a737ced28f</Sha>
8181
</Dependency>
82-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.22558.4">
82+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.22561.2">
8383
<Uri>https://github.com/dotnet/arcade</Uri>
84-
<Sha>3f3c360819c5c092d0e4505a67dfe59a33fba557</Sha>
84+
<Sha>f36ea231c234560514ede4c2747897a737ced28f</Sha>
8585
</Dependency>
86-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22558.4">
86+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22561.2">
8787
<Uri>https://github.com/dotnet/arcade</Uri>
88-
<Sha>3f3c360819c5c092d0e4505a67dfe59a33fba557</Sha>
88+
<Sha>f36ea231c234560514ede4c2747897a737ced28f</Sha>
8989
</Dependency>
90-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22558.4">
90+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22561.2">
9191
<Uri>https://github.com/dotnet/arcade</Uri>
92-
<Sha>3f3c360819c5c092d0e4505a67dfe59a33fba557</Sha>
92+
<Sha>f36ea231c234560514ede4c2747897a737ced28f</Sha>
9393
</Dependency>
94-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22558.4">
94+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22561.2">
9595
<Uri>https://github.com/dotnet/arcade</Uri>
96-
<Sha>3f3c360819c5c092d0e4505a67dfe59a33fba557</Sha>
96+
<Sha>f36ea231c234560514ede4c2747897a737ced28f</Sha>
9797
</Dependency>
9898
</ToolsetDependencies>
9999
</Dependencies>

‎eng/Versions.props

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
</PropertyGroup>
2727
<!-- Packages that come from https://github.com/dotnet/runtime -->
2828
<PropertyGroup>
29-
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.0-rtm.22518.5</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
29+
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.0-rtm.22513.5</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
3030
<MicrosoftNETCoreAppRefVersion>7.0.0</MicrosoftNETCoreAppRefVersion>
3131
<MicrosoftNETCoreAppRuntimewinx64Version>7.0.0</MicrosoftNETCoreAppRuntimewinx64Version>
3232
<MicrosoftNETCorePlatformsVersion>7.0.0</MicrosoftNETCorePlatformsVersion>
@@ -49,8 +49,8 @@
4949
</PropertyGroup>
5050
<!-- Packages that come from https://github.com/dotnet/arcade -->
5151
<PropertyGroup>
52-
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.22558.4</MicrosoftDotNetApiCompatVersion>
53-
<MicrosoftDotNetCodeAnalysisPackageVersion>7.0.0-beta.22558.4</MicrosoftDotNetCodeAnalysisPackageVersion>
52+
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.22561.2</MicrosoftDotNetApiCompatVersion>
53+
<MicrosoftDotNetCodeAnalysisPackageVersion>7.0.0-beta.22561.2</MicrosoftDotNetCodeAnalysisPackageVersion>
5454
</PropertyGroup>
5555
<!-- Maintain System.CodeDom PackageVersion at 4.4.0. See https://github.com/Microsoft/msbuild/issues/3627 -->
5656
<!-- Pin specific versions of S.Memory so that it would supply AssemblyVersion=4.0.1.0. See https://github.com/dotnet/runtime/issues/31672 -->

‎global.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
}
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22558.4",
16-
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22558.4"
15+
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22561.2",
16+
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22561.2"
1717
},
1818
"sdk": {
1919
"version": "7.0.100"

0 commit comments

Comments
 (0)