mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #13126 from dotnet/darc-release/6.0.2xx-610272e8-350b-49bd-b20e-9f835aab1369

Browse source 
[release/6.0.2xx] Update dependencies from dotnet/sdk
This commit is contained in:
Marc Paine 2022-01-27 10:14:21 -08:00 • committed by GitHub
commit 45131a3283
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
NuGet.config
View file

@ -11,6 +11,7 @@
<!-- Begin: Package sources from dotnet-emsdk -->
<!-- End: Package sources from dotnet-emsdk -->
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<add key="darc-pub-DotNet-msbuild-Trusted-ae57d10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-ae57d105/nuget/v3/index.json" />
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- Begin: Package sources from dotnet-runtime -->
<!-- End: Package sources from dotnet-runtime -->

12
eng/Version.Details.xml
View file

@ -103,14 +103,14 @@
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>f6749ec0725a81db2491dd83b1c4b665332a7330</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.200-rtm.22075.18">
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.200-rtm.22076.18">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>0505a17332b55e1fd728fb50f20d4983af897654</Sha>
<Sha>8a705ab1294ff07ae66ea41ca890b004cfa6fd9f</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.200-rtm.22075.18">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.200-rtm.22076.18">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>0505a17332b55e1fd728fb50f20d4983af897654</Sha>
<Sha>8a705ab1294ff07ae66ea41ca890b004cfa6fd9f</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="6.0.1-servicing.21567.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
@ -146,9 +146,9 @@
<Sha>592501cbb9c9394072a245c15b3458ff88155d85</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Build" Version="17.1.0-preview-22075-05" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.Build" Version="17.1.0" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>b5c4359787ec681b1d91deed3cdbfa1b883b3e0a</Sha>
<Sha>ae57d105c6094d8d59fe42f557ad0dcb46ec285e</Sha>
<SourceBuildTarball RepoName="msbuild" ManagedOnly="true" />
</Dependency>
<Dependency Name="NuGet.Build.Tasks" Version="6.1.0-rc.103" CoherentParentDependency="Microsoft.NET.Sdk">

4
eng/Versions.props
View file

@ -56,8 +56,8 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftNETSdkPackageVersion>6.0.200-rtm.22075.18</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.200-rtm.22075.18</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>6.0.200-rtm.22076.18</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.200-rtm.22076.18</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>