Merge pull request #14146 from dotnet/darc-main-e7b7b090-030c-4019-b062-5e64752e2915

[main] Update dependencies from dotnet/sdk
This commit is contained in:
Marc Paine 2022-07-14 22:15:54 -07:00 committed by GitHub
commit b8ff00a4ee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions

View file

@ -107,14 +107,14 @@
<Sha>490f14afee79bf66626a3592dbda1af85e040a59</Sha>
<SourceBuild RepoName="templating" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.100-rc.1.22364.26">
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.100-rc.1.22364.31">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>d670c1d9c72190cdf8228ed000847f9bde55ce71</Sha>
<Sha>51a7c066d149e83a7b1211dddcbf09de3e2f490e</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.100-rc.1.22364.26">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.100-rc.1.22364.31">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>d670c1d9c72190cdf8228ed000847f9bde55ce71</Sha>
<Sha>51a7c066d149e83a7b1211dddcbf09de3e2f490e</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-rc.1.22363.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
@ -125,13 +125,13 @@
<Uri>https://github.com/dotnet/wpf</Uri>
<Sha>df1e6313039c58d5d7e10bb4ab5379c45c302646</Sha>
</Dependency>
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.0.4-beta.22362.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.0.4-beta.22363.8" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/fsharp</Uri>
<Sha>89cb1b5e93da40ccdac33e9709c72ed33577aa5d</Sha>
<Sha>e925083ac5148caeeb524dba8697e94ed8218486</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="6.0.5-beta.22362.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="6.0.5-beta.22363.8" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/fsharp</Uri>
<Sha>89cb1b5e93da40ccdac33e9709c72ed33577aa5d</Sha>
<Sha>e925083ac5148caeeb524dba8697e94ed8218486</Sha>
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.4.0-preview-20220713-01" CoherentParentDependency="Microsoft.NET.Sdk">

View file

@ -65,8 +65,8 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftNETSdkPackageVersion>7.0.100-rc.1.22364.26</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.100-rc.1.22364.26</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>7.0.100-rc.1.22364.31</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.100-rc.1.22364.31</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>