Skip to content

Update SDK's target version to 6.0 Preview 2 #49509

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

Merged
merged 3 commits into from
Mar 12, 2021
Merged

Update SDK's target version to 6.0 Preview 2 #49509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aeaaddf
Update target version of SDK to 6.0 preview 2
ViktorHofer Mar 11, 2021
03b6bbb
Remove msbuild hack in Tools.props
ViktorHofer Mar 11, 2021
76738a3
Remove sendtohelixhelp hack with P1 SDK
ViktorHofer Mar 11, 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
10 changes: 0 additions & 10 deletions eng/Tools.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,4 @@
<PackageReference Include="Microsoft.DotNet.VersionTools.Tasks" Version="$(MicrosoftDotNetVersionToolsTasksVersion)" />
</ItemGroup>

<!-- Mega hack to remove Newtonsoft.Json dependency which doesn't unify during runtime with the dependency in the SDK and causes MissingMethodExceptions. -->
<Target Name="RemovePackagingContentForMSBuildALC"
AfterTargets="Restore">
<PropertyGroup>
<_BuildTasksPackagingNewtonsoftDependency>$(NuGetPackageRoot)microsoft.dotnet.build.tasks.packaging\$(MicrosoftDotNetBuildTasksPackagingVersion)\tools\netcoreapp3.1\Newtonsoft.Json.dll</_BuildTasksPackagingNewtonsoftDependency>
</PropertyGroup>

<Delete Files="$(_BuildTasksPackagingNewtonsoftDependency)" Condition="Exists('$(_BuildTasksPackagingNewtonsoftDependency)')" />
</Target>

</Project>
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"rollForward": "major"
},
"tools": {
"dotnet": "6.0.100-preview.2.21118.7"
"dotnet": "6.0.100-preview.2.21155.3"
},
"native-tools": {
"cmake": "3.16.4",
Expand Down
8 changes: 0 additions & 8 deletions src/libraries/sendtohelixhelp.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,12 +307,4 @@
<Message Condition="'$(TestPackages)' != 'true'" Importance="High" Text="Build TargetFramework: $(BuildTargetFramework)" />
<Message Condition="'$(TestPackages)' == 'true'" Importance="High" Text="Doing Package Testing" />
</Target>

<!-- TODO: Remove after https://github.com/dotnet/arcade/pull/6975 is merged. -->
<Target Name="UpdateDotNetCliVersionForMobile"
BeforeTargets="AddDotNetSdk">
<PropertyGroup>
<DotNetCliVersion Condition="'$(DotNetCliPackageType)' == 'aspnetcore-runtime'">6.0.0-preview.1.21103.6</DotNetCliVersion>
</PropertyGroup>
</Target>
</Project>