8000 Move powershell to `2.0.0-preview3-25426-01` using the .NET CLI `2.0.… · PowerShell/PowerShell@3e35fb9 · GitHub
[go: up one dir, main page]
Skip to content

Commit 3e35fb9

Browse files
daxian-dbwdaxian-dbw
authored
Move powershell to 2.0.0-preview3-25426-01 using the .NET CLI 2.0.0-preview2-006502 (#4144)
1 parent a2922d6 commit 3e35fb9

File tree

20 files changed

+68
-91
lines changed

20 files changed

+68
-91
lines changed

‎PowerShell.Common.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
<Copyright>(c) Microsoft Corporation. All rights reserved.</Copyright>
66

77
<VersionPrefix>6.0.0</VersionPrefix>
8-
9-
<NeutralLanguage>en-US</NeutralLanguage>
10-
118
<TargetFramework>netcoreapp2.0</TargetFramework>
9+
<RuntimeFrameworkVersion>2.0.0-preview3-25426-01</RuntimeFrameworkVersion>
10+
1211
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1312
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1413
<GenerateDocumentationFile>true</GenerateDocumentationFile>
14+
<NeutralLanguage>en-US</NeutralLanguage>
1515

1616
<DelaySign>true</DelaySign>
1717
<AssemblyOriginatorKeyFile>../signing/visualstudiopublic.snk</AssemblyOriginatorKeyFile>

‎appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: 6.0.0-beta.3-{build}
22

33
image: Visual Studio 2015
44

5-
# cache version - netcoreapp.2.0.0-preview1-002106-00
5+
# cache version - netcoreapp.2.0.0-preview3-25426-01
66
cache:
77
- '%LocalAppData%\Microsoft\dotnet -> appveyor.yml'
88
- '%HOMEDRIVE%%HOMEPATH%\.nuget\packages -> appveyor.yml'

‎build.psm1

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ try {
2020
}
2121

2222
$dotnetCLIChannel = "preview"
23-
$dotnetCLIRequiredVersion = "2.0.0-preview1-005952"
23+
$dotnetCLIRequiredVersion = "2.0.0-preview2-006502"
2424

2525
# On Unix paths is separated by colon
2626
# On Windows paths is separated by semicolon
@@ -1049,7 +1049,15 @@ function Install-Dotnet {
10491049
Remove-Item -ErrorAction SilentlyContinue -Recurse -Force ~\AppData\Local\Microsoft\dotnet
10501050
$installScript = "dotnet-install.ps1"
10511051
Invoke-WebRequest -Uri $obtainUrl/$installScript -OutFile $installScript
1052-
& ./$installScript -Channel $Channel -Version $Version
1052+
1053+
if (-not $IsCoreCLR) {
1054+
& ./$installScript -Channel $Channel -Version $Version
1055+
} else {
1056+
# dotnet-install.ps1 uses APIs that are not supported in .NET Core, so we run it with Windows PowerShell
1057+
$fullPSPath = Join-Path -Path $env:windir -ChildPath "System32\WindowsPowerShell\v1.0\powershell.exe"
1058+
$fullDotnetInstallPath = Join-Path -Path $pwd.Path -ChildPath $installScript
1059+
Start-NativeExecution { & $fullPSPath -NoLogo -NoProfile -File $fullDotnetInstallPath -Channel $Channel -Version $Version }
1060+
}
10531061
}
10541062
}
10551063

‎src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
</PropertyGroup>
7171

7272
<ItemGroup>
73-
<PackageReference Include="System.ServiceProcess.ServiceController" Version="4.4.0-preview1-25302-01" />
73+
<PackageReference Include="System.ServiceProcess.ServiceController" Version="4.4.0-preview3-25423-02" />
7474
</ItemGroup>
7575

7676
</Project>

‎src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/CoreCLR/WebRequestPSCmdlet.CoreClr.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ internal virtual HttpClient GetHttpClient(bool handleRedirect)
165165

166166
if (SkipCertificateCheck)
167167
{
168-
handler.ServerCertificateCustomValidationCallback = delegate { return true; };
168+
handler.ServerCertificateCustomValidationCallback = HttpClientHandler.DangerousAcceptAnyServerCertificateValidator;
169169
}
170170

171171
// This indicates GetResponse will handle redirects.

‎src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
</PropertyGroup>
2626

2727
<ItemGroup>
28-
<PackageReference Include="System.Security.Principal.Windows" Version="4.4.0-preview1-25302-01" />
28+
<PackageReference Include="System.Security.Principal.Windows" Version="4.4.0-preview3-25423-02" />
2929
</ItemGroup>
3030

3131
</Project>

‎src/Microsoft.PowerShell.PSReadLine/AssemblyInfo.cs

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,7 @@
88
// General Information about an assembly is controlled through the following
99
// set of attributes. Change these attribute values to modify the information
1010
// associated with an assembly.
11-
[assemb 10670 ly: AssemblyTitle("PSReadLine")]
12-
[assembly: AssemblyDescription("")]
13-
[assembly: AssemblyConfiguration("")]
14-
[assembly: AssemblyCompany("")]
15-
[assembly: AssemblyProduct("PSReadLine")]
16-
[assembly: AssemblyCopyright("Copyright © 2013")]
1711
[assembly: AssemblyTrademark("")]
18-
[assembly: AssemblyCulture("")]
1912

2013
// Setting ComVisible to false makes the types in this assembly not visible
2114
// to COM components. If you need to access a type in this assembly from
@@ -24,16 +17,3 @@
2417

2518
// The following GUID is for the ID of the typelib if this project is exposed to COM
2619
[assembly: Guid("36053fb0-0bd0-4a1c-951c-b2ec109deca3")]
27-
28-
// Version information for an assembly consists of the following four values:
29-
//
30-
// Major Version
31-
// Minor Version
32-
// Build Number
33-
// Revision
34-
//
35-
// You can specify all the values or you can default the Build and Revision Numbers
36-
// by using the '*' as shown below:
37-
// [assembly: AssemblyVersion("1.0.*")]
38-
[assembly: AssemblyVersion("1.0.0.0")]
39-
[assembly: AssemblyFileVersion("1.2")]

‎src/Microsoft.PowerShell.PSReadLine/Microsoft.PowerShell.PSReadLine.csproj

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,10 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3+
<Import Project="..\..\PowerShell.Common.props"/>
4+
35
<PropertyGroup>
4-
<VersionPrefix>6.0.0</VersionPrefix>
5-
<TargetFramework>netcoreapp2.0</TargetFramework>
6-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
7-
<DelaySign>true</DelaySign>
8-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
6+
<Description>PowerShell Core's Microsoft.PowerShell.PSReadLine project</Description>
97
<AssemblyName>Microsoft.PowerShell.PSReadLine</AssemblyName>
10-
<AssemblyOriginatorKeyFile>../signing/visualstudiopublic.snk</AssemblyOriginatorKeyFile>
11-
<SignAssembly>true</SignAssembly>
12-
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
13-
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
14-
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
15-
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
16-
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
17-
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
18-
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
19-
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
208
</PropertyGroup>
219

2210
<ItemGroup>

‎src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@
1717
</ItemGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="System.Data.SqlClient" Version="4.4.0-preview1-25302-01" />
21-
<PackageReference Include="System.IO.Packaging" Version="4.4.0-preview1-25302-01" />
22-
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="4.4.0-preview1-25302-01" />
23-
<PackageReference Include="System.ServiceModel.Duplex" Version="4.4.0-preview1-25302-01" />
24-
<PackageReference Include="System.ServiceModel.Http" Version="4.4.0-preview1-25302-01" />
25-
<PackageReference Include="System.ServiceModel.NetTcp" Version="4.4.0-preview1-25302-01" />
26-
<PackageReference Include="System.ServiceModel.Primitives" Version="4.4.0-preview1-25302-01" />
27-
<PackageReference Include="System.ServiceModel.Security" Version="4.4.0-preview1-25302-01" />
28-
<PackageReference Include="System.Text.Encodings.Web" Version="4.4.0-preview1-25302-01" />
29-
<PackageReference Include="System.Threading.AccessControl" Version="4.4.0-preview1-25302-01" />
30-
<PackageReference Include="System.Private.ServiceModel" Version="4.4.0-preview1-25302-01" />
20+
<PackageReference Include="System.Data.SqlClient" Version="4.4.0-preview3-25423-02" />
21+
<PackageReference Include="System.IO.Packaging" Version="4.4.0-preview3-25423-02" />
22+
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="4.4.0-preview3-25423-02" />
23+
<PackageReference Include="System.ServiceModel.Duplex" Version="4.4.0-preview3-25423-01" />
24+
<PackageReference Include="System.ServiceModel.Http" Version="4.4.0-preview3-25423-01" />
25+
<PackageReference Include="System.ServiceModel.NetTcp" Version="4.4.0-preview3-25423-01" />
26+
<PackageReference Include="System.ServiceModel.Primitives" Version="4.4.0-preview3-25423-01" />
27+
<PackageReference Include="System.ServiceModel.Security" Version="4.4.0-preview3-25423-01" />
28+
<PackageReference Include="System.Text.Encodings.Web" Version="4.4.0-preview3-25423-02" />
29+
<PackageReference Include="System.Threading.AccessControl" Version="4.4.0-preview3-25423-02" />
30+
<PackageReference Include="System.Private.ServiceModel" Version="4.4.0-preview3-25423-01" />
3131
</ItemGroup>
3232

3333
</Project>

‎src/ResGen/ResGen.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<TargetFramework>netcoreapp2.0</TargetFramework>
66
<AssemblyName>resgen</AssemblyName>
77
<OutputType>Exe</OutputType>
8-
<RuntimeIdentifiers>ubuntu.16.10-x64;ubuntu.16.04-x64;ubuntu.14.04-x64;debian.8-x64;centos.7-x64;fedora.24-x64;win7-x86;win7-x64;win81-x64;win10-x64;osx.10.11-x64;osx.10.12-x64;opensuse.13.2-x64;opensuse.42.1-x64</RuntimeIdentifiers>
8+
<RuntimeIdentifiers>ubuntu.16.10-x64;ubuntu.16.04-x64;ubuntu.14.04-x64;debian.8-x64;centos.7-x64;fedora.24-x64;win7-x86;win7-x64;win81-x64;win10-x64;osx.10.12-x64;opensuse.13.2-x64;opensuse.42.1-x64</RuntimeIdentifiers>
99
</PropertyGroup>
1010

1111
</Project>

0 commit comments

Comments
 (0)
0