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 9
9
<ApplicationManifest >Program.manifest</ApplicationManifest >
10
10
</PropertyGroup >
11
11
12
+ <PropertyGroup Condition =" '$(TargetFramework)' == 'netcoreapp2.1'" >
13
+ <RuntimeFrameworkVersion >2.1.12</RuntimeFrameworkVersion >
14
+ </PropertyGroup >
15
+
12
16
<ItemGroup >
13
17
<PackageReference Include =" System.Xml.XDocument" version =" 4.3.0" />
14
18
<PackageReference Include =" System.Data.DataSetExtensions" version =" 4.5.0" />
15
19
<PackageReference Include =" Microsoft.CSharp" version =" 4.5.0" />
16
20
<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'" />
18
22
</ItemGroup >
19
23
20
24
<ItemGroup >
Original file line number Diff line number Diff line change 9
9
<InformationalVersion >2.0.0-beta4</InformationalVersion >
10
10
<TargetFrameworks >net461;netcoreapp2.1</TargetFrameworks >
11
11
</PropertyGroup >
12
+
13
+ <PropertyGroup Condition =" '$(TargetFramework)' == 'netcoreapp2.1'" >
14
+ <RuntimeFrameworkVersion >2.1.12</RuntimeFrameworkVersion >
15
+ </PropertyGroup >
16
+
12
17
<ItemGroup >
13
18
<PackageReference Include =" PowerShellStandard.Library" version =" 5.1.0-*" />
14
19
<PackageReference Include =" Microsoft.CSharp" version =" 4.5.0-*" />
Original file line number Diff line number Diff line change 12
12
<TestProjectType >UnitTest</TestProjectType >
13
13
</PropertyGroup >
14
14
15
+ <PropertyGroup Condition =" '$(TargetFramework)' == 'netcoreapp2.1'" >
16
+ <RuntimeFrameworkVersion >2.1.12</RuntimeFrameworkVersion >
17
+ </PropertyGroup >
18
+
15
19
<ItemGroup >
16
20
<PackageReference Include =" System.Xml.XDocument" version =" 4.3.0" />
17
21
<PackageReference Include =" System.Data.DataSetExtensions" version =" 4.5.0" />
18
22
<PackageReference Include =" System.Runtime.InteropServices.RuntimeInformation" version =" 4.3.0" />
19
23
<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'" />
22
26
<PackageReference Include =" PowerShellStandard.Library" version =" 5.1.0-*" Condition =" '$(TargetFramework)' == 'net461'" />
23
27
</ItemGroup >
24
28
Original file line number Diff line number Diff line change 1
1
2
- $MinimalSDKVersion = ' 2.1.300 '
2
+ $MinimalSDKVersion = ' 2.1.801 '
3
3
$IsWindowsEnv = [System.Environment ]::OSVersion.Platform -eq " Win32NT"
4
4
$RepoRoot = (Resolve-Path " $PSScriptRoot /.." ).Path
5
5
$LocalDotnetDirPath = if ($IsWindowsEnv ) { " $env: LocalAppData \Microsoft\dotnet" } else { " $env: HOME /.dotnet" }
@@ -68,7 +68,7 @@ function Install-Dotnet
68
68
[CmdletBinding ()]
69
69
param (
70
70
[string ]$Channel = ' release' ,
71
- [string ]$Version = ' 2.1.505 '
71
+ [string ]$Version = ' 2.1.801 '
72
72
)
73
73
74
74
try {
@@ -77,9 +77,9 @@ function Install-Dotnet
77
77
} catch { }
78
78
79
79
$logMsg = if (Get-Command ' dotnet' - ErrorAction Ignore) {
80
- " dotent SDK is not present. Installing dotnet SDK."
81
- } else {
82
80
" dotnet SDK out of date. Require '$MinimalSDKVersion ' but found '$dotnetSDKVersion '. Updating dotnet."
81
+ } else {
82
+ " dotent SDK is not present. Installing dotnet SDK."
83
83
}
84
84
Write-Log $logMsg - Warning
85
85
You can’t perform that action at this time.
0 commit comments