Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update included toolset to match .NET 6 preview4 #2159

Merged
merged 1 commit into from
May 24, 2021
Merged

Update included toolset to match .NET 6 preview4 #2159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions NuGet.Config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@
<clear />
<add key="NuGet" value="https://api.nuget.org/v3/index.json" />
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
<add key="dotnet5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json" />
<add key="dotnet5-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json" />
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
<add key="dotnet6-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-transport/nuget/v3/index.json" />
<add key="vs-impl@Local" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl%40Local/nuget/v3/index.json" />
<add key="vs-impl" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json" />
<add key="OmniSharp" value="https://www.myget.org/F/omnisharp/api/v3/index.json" />
</packageSources>
</configuration>
36 changes: 18 additions & 18 deletions tools/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@
-->

<!-- These packages should match the "MicrosoftNETSdkPackageVersion" property-->
<package id="Microsoft.NET.Sdk" version="6.0.100-preview.3.21207.11" />
<package id="Microsoft.DotNet.MSBuildSdkResolver" version="6.0.100-preview.3.21207.11" />
<package id="Microsoft.NET.Sdk" version="6.0.100-preview.4.21262.19" />
<package id="Microsoft.DotNet.MSBuildSdkResolver" version="6.0.100-preview.4.21262.19" />

<!-- These packages should match the "MicrosoftNETCoreDotNetHostResolverPackageVersion" property -->
<package id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-preview.3.21201.4" />
<package id="runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-preview.3.21201.4" />
<package id="runtime.win-x64.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-preview.3.21201.4" />
<package id="runtime.win-x86.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-preview.3.21201.4" />
<package id="runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-preview.3.21201.4" />
<package id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-preview.4.21253.7" />
<package id="runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-preview.4.21253.7" />
<package id="runtime.win-x64.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-preview.4.21253.7" />
<package id="runtime.win-x86.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-preview.4.21253.7" />
<package id="runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver" version="6.0.0-preview.4.21253.7" />

<!--
The version for these packages can be found in the dotnet/sdk eng/Versions.props file in
Expand All @@ -30,22 +30,22 @@
-->

<!-- These packages should match the "MicrosoftBuildPackageVersion" property -->
<package id="Microsoft.Build" version="16.10.0-preview-21181-07" />
<package id="Microsoft.Build.Framework" version="16.10.0-preview-21181-07" />
<package id="Microsoft.Build.Runtime" version="16.10.0-preview-21181-07" />
<package id="Microsoft.Build.Tasks.Core" version="16.10.0-preview-21181-07" />
<package id="Microsoft.Build.Utilities.Core" version="16.10.0-preview-21181-07" />
<package id="Microsoft.Build" version="16.11.0-preview-21254-21" />
<package id="Microsoft.Build.Framework" version="16.11.0-preview-21254-21" />
<package id="Microsoft.Build.Runtime" version="16.11.0-preview-21254-21" />
<package id="Microsoft.Build.Tasks.Core" version="16.11.0-preview-21254-21" />
<package id="Microsoft.Build.Utilities.Core" version="16.11.0-preview-21254-21" />
<!-- This package should match as well except the Major & Minor version are set to 1.0 -->
<package id="Microsoft.NET.StringTools" version="1.0.0-preview-21181-07" />
<package id="Microsoft.NET.StringTools" version="1.0.0-preview-21254-21" />

<!-- This package should match the "MicrosoftNetCompilersToolsetPackageVersion" property-->
<package id="Microsoft.Net.Compilers.Toolset" version="3.10.0-3.21201.20" />
<package id="Microsoft.Net.Compilers.Toolset" version="4.0.0-2.21254.26" />

<!-- These packages should match the "NuGetBuildTasksPackageVersion" property -->
<package id="Microsoft.Build.NuGetSdkResolver" version="5.10.0-preview.2.7190" />
<package id="NuGet.Build.Tasks" version="5.10.0-preview.2.7190" />
<package id="NuGet.Commands" version="5.10.0-preview.2.7190" />
<package id="NuGet.Credentials" version="5.10.0-preview.2.7190" />
<package id="Microsoft.Build.NuGetSdkResolver" version="5.10.0-rc.7240" />
<package id="NuGet.Build.Tasks" version="5.10.0-rc.7240" />
<package id="NuGet.Commands" version="5.10.0-rc.7240" />
<package id="NuGet.Credentials" version="5.10.0-rc.7240" />

<!-- This package should match the "NewtonsoftJsonPackageVersion" property-->
<package id="Newtonsoft.Json" version="12.0.3" />
Expand Down