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 build tools to match .NET 6 Preview 7 SDK #2196

Merged
merged 3 commits into from
Jul 27, 2021
Merged

Update included build tools to match .NET 6 Preview 7 SDK #2196

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
95b16c2
Update included build tools to match .NET 6 Preview 7 SDK
JoeRobich Jul 26, 2021
cd14f70
Merge branch 'master' into update-build-tools4
JoeRobich Jul 26, 2021
f4a6654
Account for new complex AwaitCompletionProvider
JoeRobich Jul 27, 2021
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
2 changes: 1 addition & 1 deletion build/Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<MicrosoftTestPackageVersion>16.9.4</MicrosoftTestPackageVersion>
<MSBuildPackageVersion>16.10.0</MSBuildPackageVersion>
<NuGetPackageVersion>5.2.0</NuGetPackageVersion>
<RoslynPackageVersion>4.0.0-2.21354.7</RoslynPackageVersion>
<RoslynPackageVersion>4.0.0-3.21373.8</RoslynPackageVersion>
<XunitPackageVersion>2.4.1</XunitPackageVersion>
</PropertyGroup>

Expand Down
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.6.21358.20" />
<package id="Microsoft.DotNet.MSBuildSdkResolver" version="6.0.100-preview.6.21358.20" />
<package id="Microsoft.NET.Sdk" version="6.0.100-preview.7.21376.11" />
<package id="Microsoft.DotNet.MSBuildSdkResolver" version="6.0.100-preview.7.21376.11" />

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

<!--
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="17.0.0-preview-21359-01" />
<package id="Microsoft.Build.Framework" version="17.0.0-preview-21359-01" />
<package id="Microsoft.Build.Runtime" version="17.0.0-preview-21359-01" />
<package id="Microsoft.Build.Tasks.Core" version="17.0.0-preview-21359-01" />
<package id="Microsoft.Build.Utilities.Core" version="17.0.0-preview-21359-01" />
<package id="Microsoft.Build" version="17.0.0-preview-21376-04" />
<package id="Microsoft.Build.Framework" version="17.0.0-preview-21376-04" />
<package id="Microsoft.Build.Runtime" version="17.0.0-preview-21376-04" />
<package id="Microsoft.Build.Tasks.Core" version="17.0.0-preview-21376-04" />
<package id="Microsoft.Build.Utilities.Core" version="17.0.0-preview-21376-04" />
<!-- 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-21359-01" />
<package id="Microsoft.NET.StringTools" version="1.0.0-preview-21376-04" />

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

<!-- These packages should match the "NuGetBuildTasksPackageVersion" property -->
<package id="Microsoft.Build.NuGetSdkResolver" version="6.0.0-preview.2.129" />
<package id="NuGet.Build.Tasks" version="6.0.0-preview.2.129" />
<package id="NuGet.Commands" version="6.0.0-preview.2.129" />
<package id="NuGet.Credentials" version="6.0.0-preview.2.129" />
<package id="Microsoft.Build.NuGetSdkResolver" version="6.0.0-preview.3.158" />
<package id="NuGet.Build.Tasks" version="6.0.0-preview.3.158" />
<package id="NuGet.Commands" version="6.0.0-preview.3.158" />
<package id="NuGet.Credentials" version="6.0.0-preview.3.158" />

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