зеркало из https://github.com/dotnet/LLVMSharp.git
Moving forward to .NET 6
This commit is contained in:
Родитель
5fe5a50fd8
Коммит
c831ba5551
|
@ -123,8 +123,7 @@ try {
|
|||
$DotNetInstallDirectory = Join-Path -Path $ArtifactsDir -ChildPath "dotnet"
|
||||
Create-Directory -Path $DotNetInstallDirectory
|
||||
|
||||
& $DotNetInstallScript -Channel 5.0 -Version latest -InstallDir $DotNetInstallDirectory -Architecture $architecture
|
||||
& $DotNetInstallScript -Channel 3.1 -Version latest -InstallDir $DotNetInstallDirectory -Architecture $architecture -Runtime dotnet
|
||||
& $DotNetInstallScript -Channel 6.0 -Version latest -InstallDir $DotNetInstallDirectory -Architecture $architecture
|
||||
|
||||
$env:PATH="$DotNetInstallDirectory;$env:PATH"
|
||||
}
|
||||
|
|
|
@ -204,8 +204,7 @@ if [[ ! -z "$architecture" ]]; then
|
|||
DotNetInstallDirectory="$ArtifactsDir/dotnet"
|
||||
CreateDirectory "$DotNetInstallDirectory"
|
||||
|
||||
. "$DotNetInstallScript" --channel 5.0 --version latest --install-dir "$DotNetInstallDirectory" --architecture "$architecture"
|
||||
. "$DotNetInstallScript" --channel 3.1 --version latest --install-dir "$DotNetInstallDirectory" --architecture "$architecture" --runtime dotnet
|
||||
. "$DotNetInstallScript" --channel 6.0 --version latest --install-dir "$DotNetInstallDirectory" --architecture "$architecture"
|
||||
|
||||
PATH="$DotNetInstallDirectory:$PATH:"
|
||||
fi
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>net5.0;netcoreapp3.1;netstandard2.0</TargetFrameworks>
|
||||
<TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
<PropertyGroup>
|
||||
<IncludeContentInPack>false</IncludeContentInPack>
|
||||
<TargetFrameworks>net5.0;netcoreapp3.1;netstandard2.0</TargetFrameworks>
|
||||
<TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>net5.0;netcoreapp3.1</TargetFrameworks>
|
||||
<TargetFrameworks>net6.0</TargetFrameworks>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
Загрузка…
Ссылка в новой задаче