Skip to content

Commit 839ecb8

Browse files
iSazonovdaxian-dbw
iSazonov
authored and
daxian-dbw
committed
Move to dotnet core 2.1.1 (PowerShell#7161)
1 parent 15f6abe commit 839ecb8

10 files changed

Lines changed: 23 additions & 21 deletions

File tree

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ after_success:
6161
# which is expensive and unneeded for build agents.
6262
env:
6363
global:
64-
- CACHE_VERSION=netcoreapp.2.1-sdk.2.1.300
64+
- CACHE_VERSION=netcoreapp.2.1-sdk.2.1.301
6565
- POWERSHELL_TELEMETRY_OPTOUT=1
6666
- DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
6767

‎PowerShell.Common.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@
9494
<Copyright>(c) Microsoft Corporation. All rights reserved.</Copyright>
9595

9696
<TargetFramework>netcoreapp2.1</TargetFramework>
97+
<RuntimeFrameworkVersion>2.1.1</RuntimeFrameworkVersion>
9798
<LangVersion>Latest</LangVersion>
9899

99100
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>

‎appveyor.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ environment:
99
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
1010
Purpose: ElevatedPesterTests_xUnit_Packaging
1111

12-
# cache version - netcoreapp.2.1-sdk.2.1.300
12+
# cache version - netcoreapp.2.1-sdk.2.1.301
1313
cache:
1414
- '%HOMEDRIVE%%HOMEPATH%\.nuget\packages -> appveyor.yml'
1515

‎assets/files.wxs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,8 @@
190190
<Component Id="cmp2B60F4AC2E8D95A558C3E121A6252D37" Guid="{C361734D-C0E0-47E2-B867-82878D0F0E4C}">
191191
<File Id="fil8E8E3BF1C97D92DFEB4FC97D778F238F" KeyPath="yes" Source="$(env.ProductSourcePath)\System.Runtime.CompilerServices.VisualC.dll" />
192192
</Component>
193-
<Component Id="cmp8777CA81FBD5C5FAC86993893043793D" Guid="{B2D9982B-D46A-4D69-AA16-CC7EC49D357F}">
194-
<File Id="fil9A6CE1B34698E9E81BC367B9E9CEBF25" KeyPath="yes" Source="$(env.ProductSourcePath)\sos_$(var.FileArchitecture)_$(var.FileArchitecture)_4.6.26515.07.dll" />
193+
<Component Id="cmp94BBA02944344967A5B4ABEDB5E5AD21" Guid="{0E836BC9-94C6-42F2-B213-2990D06172BE}">
194+
<File Id="filDDE80F6ACEC54B56BA33E587A072DE27" KeyPath="yes" Source="$(env.ProductSourcePath)\sos_$(var.FileArchitecture)_$(var.FileArchitecture)_4.6.26606.02.dll" />
195195
</Component>
196196
<Component Id="cmp5977DC14DE00AD6E597A2FEBB8C3B58B" Guid="{8E01E3C2-0596-46D8-95DD-BCA308A88941}">
197197
<File Id="filEE7925E7A712381B024DAE39831F7AEB" KeyPath="yes" Source="$(env.ProductSourcePath)\System.Threading.dll" />
@@ -487,8 +487,8 @@
487487
<Component Id="cmp644DFED4A59040568D091F0EA5F691E6" Guid="{C63BB7F7-682A-4EF4-AEFE-5A7BE5475AAA}">
488488
<File Id="fil69EA4231E04E7B76EE0676A3C7EB4F91" KeyPath="yes" Source="$(env.ProductSourcePath)\System.Security.Cryptography.Pkcs.dll" />
489489
</Component>
490-
<Component Id="cmp87DE113A572097FF094F31D019BB29BE" Guid="{2773E961-6227-40EE-B293-2929168E960A}">
491-
<File Id="fil9320215B904D0997AADD8E1C11CA0998" KeyPath="yes" Source="$(env.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_4.6.26515.07.dll" />
490+
<Component Id="cmpFACAD92324CA40CAB89EFD08A5EE1BCB" Guid="{C2E1292A-F64D-44B3-9E82-91ADF240228E}">
491+
<File Id="fil87A274531F374FB186928D7A3B28F54F" KeyPath="yes" Source="$(env.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_4.6.26606.02.dll" />
492492
</Component>
493493
<Component Id="cmpCC989C2FC3319628C5A0897A9CDB4C7D" Guid="{2FC1414C-925B-4653-B376-0DC7114DAA4C}">
494494
<File Id="fil2FBB26045517B5A73BF6024C55539694" KeyPath="yes" Source="$(env.ProductSourcePath)\api-ms-win-core-processthreads-l1-1-0.dll" />
@@ -1971,7 +1971,7 @@
19711971
<ComponentRef Id="cmp23FD946C6681D6747F1B638ECBE8C8BC" />
19721972
<ComponentRef Id="cmp4B935A8190C2D7D1F0E0DB9E5AAD7F30" />
19731973
<ComponentRef Id="cmp2B60F4AC2E8D95A558C3E121A6252D37" />
1974-
<ComponentRef Id="cmp8777CA81FBD5C5FAC86993893043793D" />
1974+
<ComponentRef Id="cmp94BBA02944344967A5B4ABEDB5E5AD21" />
19751975
<ComponentRef Id="cmp5977DC14DE00AD6E597A2FEBB8C3B58B" />
19761976
<ComponentRef Id="cmp689C7CE34E0246D8B56D370E898354CE" />
19771977
<ComponentRef Id="cmp634E012FEF6122735D91DE4B1BCC1116" />
@@ -2070,7 +2070,7 @@
20702070
<ComponentRef Id="cmpE66ABF016916C709133CA0DB9366469F" />
20712071
<ComponentRef Id="cmpECCD26D8C540FA35F5C633B318EB742E" />
20722072
<ComponentRef Id="cmp644DFED4A59040568D091F0EA5F691E6" />
2073-
<ComponentRef Id="cmp87DE113A572097FF094F31D019BB29BE" />
2073+
<ComponentRef Id="cmpFACAD92324CA40CAB89EFD08A5EE1BCB" />
20742074
<ComponentRef Id="cmpCC989C2FC3319628C5A0897A9CDB4C7D" />
20752075
<ComponentRef Id="cmpC9085D713FC071587C61ACFE51384BDD" />
20762076
<ComponentRef Id="cmpB942FEF3BC11F835DF30CDDD845486AD" />

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"version": "2.1.300"
3+
"version": "2.1.301"
44
}
55
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@
6565
</ItemGroup>
6666

6767
<ItemGroup>
68-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="2.7.0" />
69-
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="2.7.0" />
70-
<PackageReference Include="NJsonSchema" Version="9.10.50" />
68+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="2.8.2" />
69+
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="2.8.2" />
70+
<PackageReference Include="NJsonSchema" Version="9.10.56" />
7171
</ItemGroup>
7272

7373
</Project>

‎src/Microsoft.PowerShell.ConsoleHost/Microsoft.PowerShell.ConsoleHost.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<ItemGroup>
1010
<ProjectReference Include="..\System.Management.Automation\System.Management.Automation.csproj" />
1111
<!-- the following package(s) are from https://github.com/microsoft/applicationinsights-??? -->
12-
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.5.1" />
12+
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.6.4" />
1313
</ItemGroup>
1414

1515
<PropertyGroup>

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@
1616

1717
<ItemGroup>
1818
<!-- the following package(s) are from https://github.com/dotnet/fxdac -->
19-
<PackageReference Include="System.Data.SqlClient" Version="4.5.0" />
19+
<PackageReference Include="System.Data.SqlClient" Version="4.5.1" />
2020
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
2121
<PackageReference Include="System.IO.Packaging" Version="4.5.0" />
2222
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="4.5.0" />
2323
<PackageReference Include="System.Text.Encodings.Web" Version="4.5.0" />
2424
<PackageReference Include="System.Threading.AccessControl" Version="4.5.0" />
2525
<!-- the following package(s) are from https://github.com/dotnet/wfc -->
26-
<PackageReference Include="System.ServiceModel.Duplex" Version="4.5.0" />
27-
<PackageReference Include="System.ServiceModel.Http" Version="4.5.0" />
28-
<PackageReference Include="System.ServiceModel.NetTcp" Version="4.5.0" />
29-
<PackageReference Include="System.ServiceModel.Primitives" Version="4.5.0" />
30-
<PackageReference Include="System.ServiceModel.Security" Version="4.5.0" />
31-
<PackageReference Include="System.Private.ServiceModel" Version="4.5.0" />
26+
<PackageReference Include="System.ServiceModel.Duplex" Version="4.5.1" />
27+
<PackageReference Include="System.ServiceModel.Http" Version="4.5.1" />
28+
<PackageReference Include="System.ServiceModel.NetTcp" Version="4.5.1" />
29+
<PackageReference Include="System.ServiceModel.Primitives" Version="4.5.1" />
30+
<PackageReference Include="System.ServiceModel.Security" Version="4.5.1" />
31+
<PackageReference Include="System.Private.ServiceModel" Version="4.5.1" />
3232
<!-- the source could not be found for the following package(s) -->
3333
<PackageReference Include="Microsoft.NETCore.Windows.ApiSets" Version="1.0.1" />
3434
<PackageReference Include="Microsoft.Windows.Compatibility" Version="2.0.0" />

‎test/Test.Common.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<Copyright>(c) Microsoft Corporation. All rights reserved.</Copyright>
66

77
<TargetFramework>netcoreapp2.1</TargetFramework>
8+
<RuntimeFrameworkVersion>2.1.1</RuntimeFrameworkVersion>
89

910
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1011
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>

‎test/tools/WebListener/WebListener.csproj‎

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

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.0" />
10+
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.1" />
1111
</ItemGroup>
1212

1313
<ItemGroup>

0 commit comments

Comments
 (0)