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

Merge pull request #7327 from dotnet/ViktorHofer-50sdk

Browse source 
Update the SDK to mitigate a runtime regression
This commit is contained in:
William Li 2020-04-30 15:52:06 -07:00 committed by GitHub
commit 9f54dd9d24
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
global.json
View file

@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "5.0.100-preview.4.20217.10",
"dotnet": "5.0.100-preview.5.20228.8",
"runtimes": {
"dotnet": [
"$(MicrosoftNETCoreAppRuntimePackageVersion)"

4
src/redist/targets/BundledTemplates.targets
View file

@ -174,8 +174,8 @@
<Target Name="LayoutTemplatesForSDK"
DependsOnTargets="SetupBundledComponents;CalculateTemplatesVersions">
<ItemGroup Condition="!$(ProductMonikerRid.StartsWith('win'))">
<BundledTemplate Remove="Microsoft.Dotnet.Wpf.ProjectTemplates" />
<BundledTemplate Remove="Microsoft.Dotnet.WinForms.ProjectTemplates" />
<Bundled50Templates Remove="Microsoft.Dotnet.Wpf.ProjectTemplates" />
<Bundled50Templates Remove="Microsoft.Dotnet.WinForms.ProjectTemplates" />
</ItemGroup>
<Copy SourceFiles="%(Bundled50Templates.RestoredNupkgPath)"
DestinationFolder="$(RedistLayoutPath)templates/$(BundledTemplates50InstallPath)"/>