Skip to content

Move to dotnet 2.1.301 #7161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
daxian-dbw merged 8 commits into from
Jun 29, 2018
Merged

Move to dotnet 2.1.301 #7161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
bc3ea97
[Feature] Move to dotnet 2.1.301
iSazonov Jun 25, 2018
28202bd
[Feature] Update versions of packages
iSazonov Jun 25, 2018
cc85770
[Feature] Update System.ServiceModel.Primitives version
iSazonov Jun 25, 2018
d35de90
Add <RuntimeFrameworkVersion>2.1.1</RuntimeFrameworkVersion> in Test.…
iSazonov Jun 25, 2018
f339a03
Remove unneeded components from Files.wxs
iSazonov Jun 25, 2018
d9d5380
Add new components
iSazonov Jun 25, 2018
06389ed
Fix case
iSazonov Jun 26, 2018
fa4db60
Remove the logging
daxian-dbw Jun 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ after_success:
# which is expensive and unneeded for build agents.
env:
global:
- CACHE_VERSION=netcoreapp.2.1-sdk.2.1.300
- CACHE_VERSION=netcoreapp.2.1-sdk.2.1.301
- POWERSHELL_TELEMETRY_OPTOUT=1
- DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1

Expand Down
1 change: 1 addition & 0 deletions PowerShell.Common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@
<Copyright>(c) Microsoft Corporation. All rights reserved.</Copyright>

<TargetFramework>netcoreapp2.1</TargetFramework>
<RuntimeFrameworkVersion>2.1.1</RuntimeFrameworkVersion>
<LangVersion>Latest</LangVersion>

<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ environment:
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
Purpose: ElevatedPesterTests_xUnit_Packaging

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

Expand Down
12 changes: 6 additions & 6 deletions assets/files.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,8 @@
<Component Id="cmp2B60F4AC2E8D95A558C3E121A6252D37" Guid="{C361734D-C0E0-47E2-B867-82878D0F0E4C}">
<File Id="fil8E8E3BF1C97D92DFEB4FC97D778F238F" KeyPath="yes" Source="$(env.ProductSourcePath)\System.Runtime.CompilerServices.VisualC.dll" />
</Component>
<Component Id="cmp8777CA81FBD5C5FAC86993893043793D" Guid="{B2D9982B-D46A-4D69-AA16-CC7EC49D357F}">
<File Id="fil9A6CE1B34698E9E81BC367B9E9CEBF25" KeyPath="yes" Source="$(env.ProductSourcePath)\sos_$(var.FileArchitecture)_$(var.FileArchitecture)_4.6.26515.07.dll" />
<Component Id="cmp94BBA02944344967A5B4ABEDB5E5AD21" Guid="{0E836BC9-94C6-42F2-B213-2990D06172BE}">
<File Id="filDDE80F6ACEC54B56BA33E587A072DE27" KeyPath="yes" Source="$(env.ProductSourcePath)\sos_$(var.FileArchitecture)_$(var.FileArchitecture)_4.6.26606.02.dll" />
</Component>
<Component Id="cmp5977DC14DE00AD6E597A2FEBB8C3B58B" Guid="{8E01E3C2-0596-46D8-95DD-BCA308A88941}">
<File Id="filEE7925E7A712381B024DAE39831F7AEB" KeyPath="yes" Source="$(env.ProductSourcePath)\System.Threading.dll" />
Expand Down Expand Up @@ -487,8 +487,8 @@
<Component Id="cmp644DFED4A59040568D091F0EA5F691E6" Guid="{C63BB7F7-682A-4EF4-AEFE-5A7BE5475AAA}">
<File Id="fil69EA4231E04E7B76EE0676A3C7EB4F91" KeyPath="yes" Source="$(env.ProductSourcePath)\System.Security.Cryptography.Pkcs.dll" />
</Component>
<Component Id="cmp87DE113A572097FF094F31D019BB29BE" Guid="{2773E961-6227-40EE-B293-2929168E960A}">
<File Id="fil9320215B904D0997AADD8E1C11CA0998" KeyPath="yes" Source="$(env.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_4.6.26515.07.dll" />
<Component Id="cmpFACAD92324CA40CAB89EFD08A5EE1BCB" Guid="{C2E1292A-F64D-44B3-9E82-91ADF240228E}">
<File Id="fil87A274531F374FB186928D7A3B28F54F" KeyPath="yes" Source="$(env.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_4.6.26606.02.dll" />
</Component>
<Component Id="cmpCC989C2FC3319628C5A0897A9CDB4C7D" Guid="{2FC1414C-925B-4653-B376-0DC7114DAA4C}">
<File Id="fil2FBB26045517B5A73BF6024C55539694" KeyPath="yes" Source="$(env.ProductSourcePath)\api-ms-win-core-processthreads-l1-1-0.dll" />
Expand Down Expand Up @@ -1971,7 +1971,7 @@
<ComponentRef Id="cmp23FD946C6681D6747F1B638ECBE8C8BC" />
<ComponentRef Id="cmp4B935A8190C2D7D1F0E0DB9E5AAD7F30" />
<ComponentRef Id="cmp2B60F4AC2E8D95A558C3E121A6252D37" />
<ComponentRef Id="cmp8777CA81FBD5C5FAC86993893043793D" />
<ComponentRef Id="cmp94BBA02944344967A5B4ABEDB5E5AD21" />
<ComponentRef Id="cmp5977DC14DE00AD6E597A2FEBB8C3B58B" />
<ComponentRef Id="cmp689C7CE34E0246D8B56D370E898354CE" />
<ComponentRef Id="cmp634E012FEF6122735D91DE4B1BCC1116" />
Expand Down Expand Up @@ -2070,7 +2070,7 @@
<ComponentRef Id="cmpE66ABF016916C709133CA0DB9366469F" />
<ComponentRef Id="cmpECCD26D8C540FA35F5C633B318EB742E" />
<ComponentRef Id="cmp644DFED4A59040568D091F0EA5F691E6" />
<ComponentRef Id="cmp87DE113A572097FF094F31D019BB29BE" />
<ComponentRef Id="cmpFACAD92324CA40CAB89EFD08A5EE1BCB" />
<ComponentRef Id="cmpCC989C2FC3319628C5A0897A9CDB4C7D" />
<ComponentRef Id="cmpC9085D713FC071587C61ACFE51384BDD" />
<ComponentRef Id="cmpB942FEF3BC11F835DF30CDDD845486AD" />
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "2.1.300"
"version": "2.1.301"
}
}
6 changes: 3 additions & 3 deletions src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="2.7.0" />
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="2.7.0" />
<PackageReference Include="NJsonSchema" Version="9.10.50" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="2.8.2" />
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="2.8.2" />
<PackageReference Include="NJsonSchema" Version="9.10.56" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/Microsoft.PowerShell.ConsoleHost/Microsoft.PowerShell.ConsoleHost.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<ItemGroup>
<ProjectReference Include="..\System.Management.Automation\System.Management.Automation.csproj" />
<!-- the following package(s) are from https://github.com/microsoft/applicationinsights-??? -->
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.5.1" />
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.6.4" />
</ItemGroup>

<PropertyGroup>
Expand Down
14 changes: 7 additions & 7 deletions src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,19 @@

<ItemGroup>
<!-- the following package(s) are from https://github.com/dotnet/fxdac -->
<PackageReference Include="System.Data.SqlClient" Version="4.5.0" />
<PackageReference Include="System.Data.SqlClient" Version="4.5.1" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.IO.Packaging" Version="4.5.0" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="4.5.0" />
<PackageReference Include="System.Text.Encodings.Web" Version="4.5.0" />
<PackageReference Include="System.Threading.AccessControl" Version="4.5.0" />
<!-- the following package(s) are from https://github.com/dotnet/wfc -->
<PackageReference Include="System.ServiceModel.Duplex" Version="4.5.0" />
<PackageReference Include="System.ServiceModel.Http" Version="4.5.0" />
<PackageReference Include="System.ServiceModel.NetTcp" Version="4.5.0" />
<PackageReference Include="System.ServiceModel.Primitives" Version="4.5.0" />
<PackageReference Include="System.ServiceModel.Security" Version="4.5.0" />
<PackageReference Include="System.Private.ServiceModel" Version="4.5.0" />
<PackageReference Include="System.ServiceModel.Duplex" Version="4.5.1" />
<PackageReference Include="System.ServiceModel.Http" Version="4.5.1" />
<PackageReference Include="System.ServiceModel.NetTcp" Version="4.5.1" />
<PackageReference Include="System.ServiceModel.Primitives" Version="4.5.1" />
<PackageReference Include="System.ServiceModel.Security" Version="4.5.1" />
<PackageReference Include="System.Private.ServiceModel" Version="4.5.1" />
<!-- the source could not be found for the following package(s) -->
<PackageReference Include="Microsoft.NETCore.Windows.ApiSets" Version="1.0.1" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="2.0.0" />
Expand Down
1 change: 1 addition & 0 deletions test/Test.Common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<Copyright>(c) Microsoft Corporation. All rights reserved.</Copyright>

<TargetFramework>netcoreapp2.1</TargetFramework>
<RuntimeFrameworkVersion>2.1.1</RuntimeFrameworkVersion>

<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
Expand Down
2 changes: 1 addition & 1 deletion test/tools/WebListener/WebListener.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.0" />
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.1" />
</ItemGroup>

<ItemGroup>
Expand Down