Skip to content

Commit f3da421

Browse files
v-wuzhaiv-wuzhai
authored
Merge pull request #14338 from dotnet/darc-release/7.0.1xx-04d5d9b9-e062-42a6-9345-88050b7592e0
[release/7.0.1xx] Update dependencies from dotnet/sdk
2 parents b54ad51 + 4ccfaf2 commit f3da421

File tree

2 files changed

+38
-38
lines changed

2 files changed

+38
-38
lines changed

‎eng/Version.Details.xml

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -52,34 +52,34 @@
5252
<Uri>https://github.com/dotnet/runtime</Uri>
5353
<Sha>f52d8c59bb49360eb2cbeeb863c5856ebd62adda</Sha>
5454
</Dependency>
55-
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.0-rc.1.22415.2" CoherentParentDependency="Microsoft.NET.Sdk">
55+
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.0-rc.1.22415.4" CoherentParentDependency="Microsoft.NET.Sdk">
5656
<Uri>https://github.com/dotnet/aspnetcore</Uri>
57-
<Sha>d3b7623a90d79719c0efe5fa0098f698176efa16</Sha>
57+
<Sha>0438e7ec04808230c67b00caa3d584bd2b991f57</Sha>
5858
</Dependency>
59-
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.0-rc.1.22415.2" CoherentParentDependency="Microsoft.NET.Sdk">
59+
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.0-rc.1.22415.4" CoherentParentDependency="Microsoft.NET.Sdk">
6060
<Uri>https://github.com/dotnet/aspnetcore</Uri>
61-
<Sha>d3b7623a90d79719c0efe5fa0098f698176efa16</Sha>
61+
<Sha>0438e7ec04808230c67b00caa3d584bd2b991f57</Sha>
6262
</Dependency>
63-
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="7.0.0-rc.1.22415.2" CoherentParentDependency="Microsoft.NET.Sdk">
63+
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="7.0.0-rc.1.22415.4" CoherentParentDependency="Microsoft.NET.Sdk">
6464
<Uri>https://github.com/dotnet/aspnetcore</Uri>
65-
<Sha>d3b7623a90d79719c0efe5fa0098f698176efa16</Sha>
65+
<Sha>0438e7ec04808230c67b00caa3d584bd2b991f57</Sha>
6666
<SourceBuildTarball RepoName="aspnetcore" ManagedOnly="true" />
6767
</Dependency>
68-
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0" Version="7.0.0-rc.1.22415.2" CoherentParentDependency="Microsoft.NET.Sdk">
68+
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0" Version="7.0.0-rc.1.22415.4" CoherentParentDependency="Microsoft.NET.Sdk">
6969
<Uri>https://github.com/dotnet/aspnetcore</Uri>
70-
<Sha>d3b7623a90d79719c0efe5fa0098f698176efa16</Sha>
70+
<Sha>0438e7ec04808230c67b00caa3d584bd2b991f57</Sha>
7171
</Dependency>
72-
<Dependency Name="dotnet-dev-certs" Version="7.0.0-rc.1.22415.2" CoherentParentDependency="Microsoft.NET.Sdk">
72+
<Dependency Name="dotnet-dev-certs" Version="7.0.0-rc.1.22415.4" CoherentParentDependency="Microsoft.NET.Sdk">
7373
<Uri>https://github.com/dotnet/aspnetcore</Uri>
74-
<Sha>d3b7623a90d79719c0efe5fa0098f698176efa16</Sha>
74+
<Sha>0438e7ec04808230c67b00caa3d584bd2b991f57</Sha>
7575
</Dependency>
76-
<Dependency Name="dotnet-user-jwts" Version="7.0.0-rc.1.22415.2" CoherentParentDependency="Microsoft.NET.Sdk">
76+
<Dependency Name="dotnet-user-jwts" Version="7.0.0-rc.1.22415.4" CoherentParentDependency="Microsoft.NET.Sdk">
7777
<Uri>https://github.com/dotnet/aspnetcore</Uri>
78-
<Sha>d3b7623a90d79719c0efe5fa0098f698176efa16</Sha>
78+
<Sha>0438e7ec04808230c67b00caa3d584bd2b991f57</Sha>
7979
</Dependency>
80-
<Dependency Name="dotnet-user-secrets" Version="7.0.0-rc.1.22415.2" CoherentParentDependency="Microsoft.NET.Sdk">
80+
<Dependency Name="dotnet-user-secrets" Version="7.0.0-rc.1.22415.4" CoherentParentDependency="Microsoft.NET.Sdk">
8181
<Uri>https://github.com/dotnet/aspnetcore</Uri>
82-
<Sha>d3b7623a90d79719c0efe5fa0098f698176efa16</Sha>
82+
<Sha>0438e7ec04808230c67b00caa3d584bd2b991f57</Sha>
8383
</Dependency>
8484
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22406.1">
8585
<Uri>https://github.com/dotnet/test-templates</Uri>
@@ -98,22 +98,22 @@
9898
<Sha>a47740f5f3936da8dcebe9e8868b6311bc4402f8</Sha>
9999
<SourceBuild RepoName="test-templates" ManagedOnly="true" />
100100
</Dependency>
101-
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.100-rc.1.22415.4">
101+
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.100-rc.2.22416.39">
102102
<Uri>https://github.com/dotnet/sdk</Uri>
103-
<Sha>36aef4039764a98a3df765154d9e2cbcb95afc72</Sha>
103+
<Sha>2f67653a1021e169f8a5c1b700ae8a2146cd0f72</Sha>
104104
</Dependency>
105-
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.100-rc.1.22415.4">
105+
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.100-rc.2.22416.39">
106106
<Uri>https://github.com/dotnet/sdk</Uri>
107-
<Sha>36aef4039764a98a3df765154d9e2cbcb95afc72</Sha>
107+
<Sha>2f67653a1021e169f8a5c1b700ae8a2146cd0f72</Sha>
108108
</Dependency>
109-
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.100-rc.1.22415.4">
109+
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.100-rc.2.22416.39">
110110
<Uri>https://github.com/dotnet/sdk</Uri>
111-
<Sha>36aef4039764a98a3df765154d9e2cbcb95afc72</Sha>
111+
<Sha>2f67653a1021e169f8a5c1b700ae8a2146cd0f72</Sha>
112112
<SourceBuild RepoName="sdk" ManagedOnly="true" />
113113
</Dependency>
114-
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.100-rc.1.22415.4">
114+
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.100-rc.2.22416.39">
115115
<Uri>https://github.com/dotnet/sdk</Uri>
116-
<Sha>36aef4039764a98a3df765154d9e2cbcb95afc72</Sha>
116+
<Sha>2f67653a1021e169f8a5c1b700ae8a2146cd0f72</Sha>
117117
</Dependency>
118118
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
119119
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.0-rc.1.22377.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
@@ -124,23 +124,23 @@
124124
<Uri>https://github.com/dotnet/wpf</Uri>
125125
<Sha>cd58f79f496337e608662e168c80ac8abd0d151b</Sha>
126126
</Dependency>
127-
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.0.6-beta.22413.1" CoherentParentDependency="Microsoft.NET.Sdk">
127+
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.0.6-beta.22414.2" CoherentParentDependency="Microsoft.NET.Sdk">
128128
<Uri>https://github.com/dotnet/fsharp</Uri>
129-
<Sha>2e964b8660d2d3a286de4c275037594b618f0cf3</Sha>
129+
<Sha>ee745b0455fe651b6f5e5f9b85fc59a7b2574395</Sha>
130130
</Dependency>
131-
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="6.0.6-beta.22413.1" CoherentParentDependency="Microsoft.NET.Sdk">
131+
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="6.0.6-beta.22414.2" CoherentParentDependency="Microsoft.NET.Sdk">
132132
<Uri>https://github.com/dotnet/fsharp</Uri>
133-
<Sha>2e964b8660d2d3a286de4c275037594b618f0cf3</Sha>
133+
<Sha>ee745b0455fe651b6f5e5f9b85fc59a7b2574395</Sha>
134134
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
135135
</Dependency>
136136
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.4.0-preview-20220813-01" CoherentParentDependency="Microsoft.NET.Sdk">
137137
<Uri>https://github.com/microsoft/vstest</Uri>
138138
<Sha>ef0aa102e9c7d5cf55af06c2747d11e07d12b69a</Sha>
139139
<SourceBuildTarball RepoName="vstest" ManagedOnly="true" />
140140
</Dependency>
141-
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22412.4" CoherentParentDependency="Microsoft.NET.Sdk">
141+
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22415.4" CoherentParentDependency="Microsoft.NET.Sdk">
142142
<Uri>https://github.com/dotnet/linker</Uri>
143-
<Sha>fda7b09fc005acb865deaf526c7adbb1be27a5f9</Sha>
143+
<Sha>6252a2194dd32911db2c0669fc818555687d5570</Sha>
144144
<SourceBuild RepoName="linker" ManagedOnly="true" />
145145
<RepoName>linker</RepoName>
146146
</Dependency>

‎eng/Versions.props

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,22 +49,22 @@
4949
</PropertyGroup>
5050
<PropertyGroup>
5151
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
52-
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>7.0.0-rc.1.22415.2</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
53-
<MicrosoftAspNetCoreAppRefPackageVersion>7.0.0-rc.1.22415.2</MicrosoftAspNetCoreAppRefPackageVersion>
54-
<MicrosoftAspNetCoreAppRefInternalPackageVersion>7.0.0-rc.1.22415.2</MicrosoftAspNetCoreAppRefInternalPackageVersion>
55-
<VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>7.0.0-rc.1.22415.2</VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>
56-
<dotnetdevcertsPackageVersion>7.0.0-rc.1.22415.2</dotnetdevcertsPackageVersion>
57-
<dotnetuserjwtsPackageVersion>7.0.0-rc.1.22415.2</dotnetuserjwtsPackageVersion>
58-
<dotnetusersecretsPackageVersion>7.0.0-rc.1.22415.2</dotnetusersecretsPackageVersion>
52+
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>7.0.0-rc.1.22415.4</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
53+
<MicrosoftAspNetCoreAppRefPackageVersion>7.0.0-rc.1.22415.4</MicrosoftAspNetCoreAppRefPackageVersion>
54+
<MicrosoftAspNetCoreAppRefInternalPackageVersion>7.0.0-rc.1.22415.4</MicrosoftAspNetCoreAppRefInternalPackageVersion>
55+
<VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>7.0.0-rc.1.22415.4</VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>
56+
<dotnetdevcertsPackageVersion>7.0.0-rc.1.22415.4</dotnetdevcertsPackageVersion>
57+
<dotnetuserjwtsPackageVersion>7.0.0-rc.1.22415.4</dotnetuserjwtsPackageVersion>
58+
<dotnetusersecretsPackageVersion>7.0.0-rc.1.22415.4</dotnetusersecretsPackageVersion>
5959
</PropertyGroup>
6060
<PropertyGroup>
6161
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
6262
</PropertyGroup>
6363
<PropertyGroup>
6464
<!-- Dependencies from https://github.com/dotnet/sdk -->
65-
<MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.100-rc.1.22415.4</MicrosoftDotNetCommonItemTemplatesPackageVersion>
66-
<MicrosoftNETSdkPackageVersion>7.0.100-rc.1.22415.4</MicrosoftNETSdkPackageVersion>
67-
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.100-rc.1.22415.4</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
65+
<MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.100-rc.2.22416.39</MicrosoftDotNetCommonItemTemplatesPackageVersion>
66+
<MicrosoftNETSdkPackageVersion>7.0.100-rc.2.22416.39</MicrosoftNETSdkPackageVersion>
67+
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.100-rc.2.22416.39</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
6868
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
6969
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
7070
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>

0 commit comments

Comments
 (0)