Merge pull request #14142 from dotnet/darc-main-d4f27b9b-32a6-46fa-8a70-65073e0285c3

[main] Update dependencies from dotnet/sdk
This commit is contained in:
v-wuzhai 2022-07-14 19:38:25 -07:00 committed by GitHub
commit 55b4fe93a7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 59 additions and 59 deletions

View file

@ -1,21 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="7.0.0-preview.7.22357.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="7.0.0-rc.1.22363.11" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>220c2b04c25cc6f1ca3cde9822a85cea856b8cfa</Sha>
<Sha>05a15fa33a01a9c7407643d91544bc2253046cc9</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.0-preview.7.22357.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.0-rc.1.22363.11" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>220c2b04c25cc6f1ca3cde9822a85cea856b8cfa</Sha>
<Sha>05a15fa33a01a9c7407643d91544bc2253046cc9</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.0-preview.7.22357.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.0-rc.1.22363.11" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>220c2b04c25cc6f1ca3cde9822a85cea856b8cfa</Sha>
<Sha>05a15fa33a01a9c7407643d91544bc2253046cc9</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="7.0.0-preview.7.22357.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="7.0.0-rc.1.22363.11" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>220c2b04c25cc6f1ca3cde9822a85cea856b8cfa</Sha>
<Sha>05a15fa33a01a9c7407643d91544bc2253046cc9</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.0-preview.7.22362.12" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
@ -52,34 +52,34 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b7fca07f478739d9fd50bdf5d1467c02dc05b6b0</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.0-rc.1.22363.15" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.0-rc.1.22364.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>dfd7473687bdb83142de9f44c9e2bb80405ba8ca</Sha>
<Sha>ac67d32b92520edb35139645074c704cc2605fbd</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.0-rc.1.22363.15" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.0-rc.1.22364.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>dfd7473687bdb83142de9f44c9e2bb80405ba8ca</Sha>
<Sha>ac67d32b92520edb35139645074c704cc2605fbd</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="7.0.0-rc.1.22363.15" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="7.0.0-rc.1.22364.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>dfd7473687bdb83142de9f44c9e2bb80405ba8ca</Sha>
<Sha>ac67d32b92520edb35139645074c704cc2605fbd</Sha>
<SourceBuildTarball RepoName="aspnetcore" ManagedOnly="true" />
</Dependency>
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0" Version="7.0.0-rc.1.22363.15" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0" Version="7.0.0-rc.1.22364.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>dfd7473687bdb83142de9f44c9e2bb80405ba8ca</Sha>
<Sha>ac67d32b92520edb35139645074c704cc2605fbd</Sha>
</Dependency>
<Dependency Name="dotnet-dev-certs" Version="7.0.0-rc.1.22363.15" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-dev-certs" Version="7.0.0-rc.1.22364.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>dfd7473687bdb83142de9f44c9e2bb80405ba8ca</Sha>
<Sha>ac67d32b92520edb35139645074c704cc2605fbd</Sha>
</Dependency>
<Dependency Name="dotnet-user-jwts" Version="7.0.0-rc.1.22363.15" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-user-jwts" Version="7.0.0-rc.1.22364.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>dfd7473687bdb83142de9f44c9e2bb80405ba8ca</Sha>
<Sha>ac67d32b92520edb35139645074c704cc2605fbd</Sha>
</Dependency>
<Dependency Name="dotnet-user-secrets" Version="7.0.0-rc.1.22363.15" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-user-secrets" Version="7.0.0-rc.1.22364.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>dfd7473687bdb83142de9f44c9e2bb80405ba8ca</Sha>
<Sha>ac67d32b92520edb35139645074c704cc2605fbd</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22362.1">
<Uri>https://github.com/dotnet/test-templates</Uri>
@ -98,45 +98,45 @@
<Sha>9c5549788cda5238a0e65466cbde9eb4ed42b695</Sha>
<SourceBuild RepoName="test-templates" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.100-rc.1.22363.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.100-rc.1.22364.7" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>a4a90c52d16f2de5e545c00c59ad2ccd8b4710a6</Sha>
<Sha>490f14afee79bf66626a3592dbda1af85e040a59</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.100-rc.1.22363.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.100-rc.1.22364.7" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>a4a90c52d16f2de5e545c00c59ad2ccd8b4710a6</Sha>
<Sha>490f14afee79bf66626a3592dbda1af85e040a59</Sha>
<SourceBuild RepoName="templating" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.100-rc.1.22364.1">
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.100-rc.1.22364.26">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>50a9dfe352349cd355a5ddf26a8eb78dd16a2cce</Sha>
<Sha>d670c1d9c72190cdf8228ed000847f9bde55ce71</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.100-rc.1.22364.1">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.100-rc.1.22364.26">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>50a9dfe352349cd355a5ddf26a8eb78dd16a2cce</Sha>
<Sha>d670c1d9c72190cdf8228ed000847f9bde55ce71</Sha>
</Dependency>
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.0-preview.7.22357.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.0-rc.1.22363.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/winforms</Uri>
<Sha>67bbe0551b46defdea8ddac62c8aab6130721ed7</Sha>
<Sha>e16b5a39e5edbefe849cb421e724075f5137ffa4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="7.0.0-preview.7.22357.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="7.0.0-rc.1.22363.6" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/wpf</Uri>
<Sha>e76cb7b5c8f0769b0e57b0b0374b73155475dd18</Sha>
<Sha>df1e6313039c58d5d7e10bb4ab5379c45c302646</Sha>
</Dependency>
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.0.4-beta.22361.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.0.4-beta.22362.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/fsharp</Uri>
<Sha>f224a8fa0a4dd2f8f150cfefe85b3c40f5c1bc29</Sha>
<Sha>89cb1b5e93da40ccdac33e9709c72ed33577aa5d</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="6.0.5-beta.22361.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="6.0.5-beta.22362.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/fsharp</Uri>
<Sha>f224a8fa0a4dd2f8f150cfefe85b3c40f5c1bc29</Sha>
<Sha>89cb1b5e93da40ccdac33e9709c72ed33577aa5d</Sha>
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.4.0-preview-20220711-01" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.4.0-preview-20220713-01" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/microsoft/vstest</Uri>
<Sha>b2e2126f1aa7e5753cafe9515563c99ade6a59ce</Sha>
<Sha>221a673f8f38f716b0cddba02c010e8381be96ef</Sha>
<SourceBuildTarball RepoName="vstest" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22362.3" CoherentParentDependency="Microsoft.NET.Sdk">
@ -184,9 +184,9 @@
<Sha>ab3eb7a525e31dc6fb4d9cc0b7154fa2be58dac1</Sha>
<SourceBuildTarball RepoName="diagnostics" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="7.0.0-alpha.1.22317.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="7.0.0-alpha.1.22363.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/source-build-externals</Uri>
<Sha>2754582d2b62e25a399c1048ac7be26aac9e0832</Sha>
<Sha>abff160e44e7b81ade066d176639fc6d78527478</Sha>
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.symreader" Version="1.4.0-beta2-21475-02">

View file

@ -30,15 +30,15 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>7.0.0-preview.7.22357.2</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>7.0.0-rc.1.22363.4</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/wpf -->
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>7.0.0-preview.7.22357.2</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>7.0.0-rc.1.22363.6</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/templating -->
<MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.100-rc.1.22363.1</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.100-rc.1.22364.7</MicrosoftDotNetCommonItemTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/test-templates -->
@ -52,21 +52,21 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>7.0.0-rc.1.22363.15</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>7.0.0-rc.1.22363.15</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>7.0.0-rc.1.22363.15</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>7.0.0-rc.1.22363.15</VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>
<dotnetdevcertsPackageVersion>7.0.0-rc.1.22363.15</dotnetdevcertsPackageVersion>
<dotnetuserjwtsPackageVersion>7.0.0-rc.1.22363.15</dotnetuserjwtsPackageVersion>
<dotnetusersecretsPackageVersion>7.0.0-rc.1.22363.15</dotnetusersecretsPackageVersion>
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>7.0.0-rc.1.22364.1</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>7.0.0-rc.1.22364.1</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>7.0.0-rc.1.22364.1</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>7.0.0-rc.1.22364.1</VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>
<dotnetdevcertsPackageVersion>7.0.0-rc.1.22364.1</dotnetdevcertsPackageVersion>
<dotnetuserjwtsPackageVersion>7.0.0-rc.1.22364.1</dotnetuserjwtsPackageVersion>
<dotnetusersecretsPackageVersion>7.0.0-rc.1.22364.1</dotnetusersecretsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftNETSdkPackageVersion>7.0.100-rc.1.22364.1</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.100-rc.1.22364.1</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>7.0.100-rc.1.22364.26</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.100-rc.1.22364.26</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
@ -87,10 +87,10 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
<VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>7.0.0-preview.7.22357.2</VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>
<VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>7.0.0-preview.7.22357.2</VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>7.0.0-preview.7.22357.2</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>7.0.0-preview.7.22357.2</MicrosoftWindowsDesktopAppRefPackageVersion>
<VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>7.0.0-rc.1.22363.11</VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>
<VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>7.0.0-rc.1.22363.11</VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>7.0.0-rc.1.22363.11</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>7.0.0-rc.1.22363.11</MicrosoftWindowsDesktopAppRefPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 -->
@ -168,7 +168,7 @@
<PropertyGroup>
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
<DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220711-01</MicrosoftNETTestSdkVersion>
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220713-01</MicrosoftNETTestSdkVersion>
</PropertyGroup>
<!-- dependencies for source-build tarball -->
<PropertyGroup>