File tree Expand file tree Collapse file tree 4 files changed +20
-7
lines changed
Expand file tree Collapse file tree 4 files changed +20
-7
lines changed Original file line number Diff line number Diff line change 99 <ApplicationManifest >Program.manifest</ApplicationManifest >
1010 </PropertyGroup >
1111
12+ <PropertyGroup Condition =" '$(TargetFramework)' == 'netcoreapp2.1'" >
13+ <RuntimeFrameworkVersion >2.1.12</RuntimeFrameworkVersion >
14+ </PropertyGroup >
15+
1216 <ItemGroup >
1317 <PackageReference Include =" System.Xml.XDocument" version =" 4.3.0" />
1418 <PackageReference Include =" System.Data.DataSetExtensions" version =" 4.5.0" />
1519 <PackageReference Include =" Microsoft.CSharp" version =" 4.5.0" />
1620 <PackageReference Include =" PowerShellStandard.Library" version =" 5.1.0-*" Condition =" '$(TargetFramework)' == 'net461'" />
17- <PackageReference Include =" Microsoft.PowerShell.SDK" version =" 6.2.0 " Condition =" '$(TargetFramework)' == 'netcoreapp2.1'" />
21+ <PackageReference Include =" Microsoft.PowerShell.SDK" version =" 6.2.2 " Condition =" '$(TargetFramework)' == 'netcoreapp2.1'" />
1822 </ItemGroup >
1923
2024 <ItemGroup >
Original file line number Diff line number Diff line change 99 <InformationalVersion >2.0.0-beta4</InformationalVersion >
1010 <TargetFrameworks >net461;netcoreapp2.1</TargetFrameworks >
1111 </PropertyGroup >
12+
13+ <PropertyGroup Condition =" '$(TargetFramework)' == 'netcoreapp2.1'" >
14+ <RuntimeFrameworkVersion >2.1.12</RuntimeFrameworkVersion >
15+ </PropertyGroup >
16+
1217 <ItemGroup >
1318 <PackageReference Include =" PowerShellStandard.Library" version =" 5.1.0-*" />
1419 <PackageReference Include =" Microsoft.CSharp" version =" 4.5.0-*" />
Original file line number Diff line number Diff line change 1212 <TestProjectType >UnitTest</TestProjectType >
1313 </PropertyGroup >
1414
15+ <PropertyGroup Condition =" '$(TargetFramework)' == 'netcoreapp2.1'" >
16+ <RuntimeFrameworkVersion >2.1.12</RuntimeFrameworkVersion >
17+ </PropertyGroup >
18+
1519 <ItemGroup >
1620 <PackageReference Include =" System.Xml.XDocument" version =" 4.3.0" />
1721 <PackageReference Include =" System.Data.DataSetExtensions" version =" 4.5.0" />
1822 <PackageReference Include =" System.Runtime.InteropServices.RuntimeInformation" version =" 4.3.0" />
1923 <PackageReference Include =" Microsoft.CSharp" version =" 4.5.0" />
20- <PackageReference Include =" Newtonsoft.Json" Version =" 12.0.1 " />
21- <PackageReference Include =" Microsoft.PowerShell.SDK" Version =" 6.2.0 " Condition =" '$(TargetFramework)' == 'netcoreapp2.1'" />
24+ <PackageReference Include =" Newtonsoft.Json" Version =" 12.0.2 " />
25+ <PackageReference Include =" Microsoft.PowerShell.SDK" Version =" 6.2.2 " Condition =" '$(TargetFramework)' == 'netcoreapp2.1'" />
2226 <PackageReference Include =" PowerShellStandard.Library" version =" 5.1.0-*" Condition =" '$(TargetFramework)' == 'net461'" />
2327 </ItemGroup >
2428
Original file line number Diff line number Diff line change 11
2- $MinimalSDKVersion = ' 2.1.300 '
2+ $MinimalSDKVersion = ' 2.1.801 '
33$IsWindowsEnv = [System.Environment ]::OSVersion.Platform -eq " Win32NT"
44$RepoRoot = (Resolve-Path " $PSScriptRoot /.." ).Path
55$LocalDotnetDirPath = if ($IsWindowsEnv ) { " $env: LocalAppData \Microsoft\dotnet" } else { " $env: HOME /.dotnet" }
@@ -68,7 +68,7 @@ function Install-Dotnet
6868 [CmdletBinding ()]
6969 param (
7070 [string ]$Channel = ' release' ,
71- [string ]$Version = ' 2.1.505 '
71+ [string ]$Version = ' 2.1.801 '
7272 )
7373
7474 try {
@@ -77,9 +77,9 @@ function Install-Dotnet
7777 } catch { }
7878
7979 $logMsg = if (Get-Command ' dotnet' - ErrorAction Ignore) {
80- " dotent SDK is not present. Installing dotnet SDK."
81- } else {
8280 " dotnet SDK out of date. Require '$MinimalSDKVersion ' but found '$dotnetSDKVersion '. Updating dotnet."
81+ } else {
82+ " dotent SDK is not present. Installing dotnet SDK."
8383 }
8484 Write-Log $logMsg - Warning
8585
You can’t perform that action at this time.
0 commit comments