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

Merge in 'release/6.0.1xx' changes

Browse source
This commit is contained in:
dotnet-bot 2022-03-14 05:50:45 +00:00
commit 8e99611236
4 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
NuGet.config
View file

@ -9,8 +9,6 @@
<!-- Begin: Package sources from dotnet-aspnetcore -->
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-emsdk -->
<add key="darc-pub-dotnet-emsdk-ee0a97a-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ee0a97a0-1/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-ee0a97a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ee0a97a0/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-emsdk -->
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<!-- End: Package sources from DotNet-msbuild-Trusted -->

16
eng/Version.Details.xml
View file

@ -197,23 +197,23 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22159.8">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22161.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>4f4c8c392d1c51e630f4571e39a095da7fb172c5</Sha>
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="6.0.0-beta.22159.8">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="6.0.0-beta.22161.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>4f4c8c392d1c51e630f4571e39a095da7fb172c5</Sha>
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22159.8">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22161.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>4f4c8c392d1c51e630f4571e39a095da7fb172c5</Sha>
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-servicing.22160.1">
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-servicing.22161.1">
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
<Sha>2125d910fc86ff6cd4f834d32f70f0290b31fd96</Sha>
<Sha>a4550df3cb245c4dfd9601c67f86a27a88aad962</Sha>
<SourceBuildTarball RepoName="source-build-reference-packages" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceLink.GitHub" Version="1.1.0-beta-21480-02" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">

2
eng/Versions.props
View file

@ -19,7 +19,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.22159.8</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.22161.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->

4
global.json
View file

@ -11,7 +11,7 @@
"cmake": "3.16.4"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22159.8",
"Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22159.8"
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22161.1",
"Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22161.1"
}
}