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

Update the installer target framework net6.0 (#9069)

Browse source 
- Remove unneeded package for tool install
- Install 5.0.0 and 3.1.0 runtime (rather than a preview 3.1.0 runtime)
This commit is contained in:
Matt Mitchell 2020-11-13 10:56:11 -08:00 committed by GitHub
parent efac3f2569
commit 32d179d680
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Directory.Build.props
View file

@ -19,7 +19,7 @@
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
<IsShipping>true</IsShipping> <IsShipping>true</IsShipping>
<CoreSdkTargetFramework>netcoreapp5.0</CoreSdkTargetFramework> <CoreSdkTargetFramework>net6.0</CoreSdkTargetFramework>
<NoWarn>NU5125;NU5105;NU1701</NoWarn> <NoWarn>NU5125;NU5105;NU1701</NoWarn>
</PropertyGroup> </PropertyGroup>

2
global.json
View file

@ -1,6 +1,6 @@
{ {
"tools": { "tools": {
"dotnet": "5.0.100-rc.2.20479.15", "dotnet": "6.0.100-alpha.1.20561.19",
"runtimes": { "runtimes": {
"dotnet": [ "dotnet": [
"$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)"

2
test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj
View file

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp5.0</TargetFramework> <TargetFramework>$(CoreSdkTargetFramework)</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

10
test/SdkTests/SdkTests.csproj
View file

@ -72,11 +72,11 @@
<Supports1xRuntimes>false</Supports1xRuntimes> <Supports1xRuntimes>false</Supports1xRuntimes>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="$(OsReleaseContents.Contains('NAME=%22openSUSE Leap%22'))"> <PropertyGroup Condition="$(OsReleaseContents.Contains('NAME=%22openSUSE%20Leap%22'))">
<Supports1xRuntimes>false</Supports1xRuntimes> <Supports1xRuntimes>false</Supports1xRuntimes>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="$(OsReleaseContents.Contains('NAME=%22Alpine Linux%22'))"> <PropertyGroup Condition="$(OsReleaseContents.Contains('NAME=%22Alpine%20Linux%22'))">
<Supports1xRuntimes>false</Supports1xRuntimes> <Supports1xRuntimes>false</Supports1xRuntimes>
</PropertyGroup> </PropertyGroup>
@ -93,7 +93,8 @@
<RuntimeVersionToInstall Include="2.1.0" /> <RuntimeVersionToInstall Include="2.1.0" />
<RuntimeVersionToInstall Include="2.2.5" /> <RuntimeVersionToInstall Include="2.2.5" />
<RuntimeVersionToInstall Include="3.0.0" /> <RuntimeVersionToInstall Include="3.0.0" />
<RuntimeVersionToInstall Include="3.1.0-preview1.19506.1" /> <RuntimeVersionToInstall Include="3.1.0" />
<RuntimeVersionToInstall Include="5.0.0" />
</ItemGroup> </ItemGroup>
</Target> </Target>
@ -224,12 +225,9 @@
<PropertyGroup> <PropertyGroup>
<SdkTestPackageVersion>$(MicrosoftNETSdkPackageVersion)</SdkTestPackageVersion> <SdkTestPackageVersion>$(MicrosoftNETSdkPackageVersion)</SdkTestPackageVersion>
<SdkTestPackageFeed>https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json</SdkTestPackageFeed>
<InstallToolCommand>dotnet tool install --local $(ToolCommandName)</InstallToolCommand> <InstallToolCommand>dotnet tool install --local $(ToolCommandName)</InstallToolCommand>
<InstallToolCommand>$(InstallToolCommand) --version $(SdkTestPackageVersion)</InstallToolCommand> <InstallToolCommand>$(InstallToolCommand) --version $(SdkTestPackageVersion)</InstallToolCommand>
<InstallToolCommand>$(InstallToolCommand) --add-source $(SdkTestPackageFeed)</InstallToolCommand>
</PropertyGroup> </PropertyGroup>
<Exec Command="$(ToolRunPrefix)$(InstallToolCommand)" <Exec Command="$(ToolRunPrefix)$(InstallToolCommand)"