admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to .NET Core 2.1.5 with SDK 2.1.403 (#7936)

Browse Source 
# Conflicts:
#	PowerShell.Common.props
#	appveyor.yml
#	assets/files.wxs
#	global.json
#	test/Test.Common.props
#	test/tools/WebListener/WebListener.csproj
This commit is contained in:
Ilya
2018-10-03 13:39:41 -07:00
committed by Travis Plunk
parent 855d2b9d75
commit f6138ef55e
6 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PowerShell.Common.props
+1 -1
View File
@@ -94,7 +94,7 @@
<Copyright>(c) Microsoft Corporation. All rights reserved.</Copyright>
<TargetFramework>netcoreapp2.1</TargetFramework>
<RuntimeFrameworkVersion>2.1.3</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>2.1.5</RuntimeFrameworkVersion>
<LangVersion>Latest</LangVersion>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
appveyor.yml
+1 -1
View File
@@ -9,7 +9,7 @@ environment:
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
Purpose: ElevatedPesterTests_xUnit_Packaging
# cache version - netcoreapp.2.1-sdk.2.1.401
# cache version - netcoreapp.2.1-sdk.2.1.403
cache:
- '%HOMEDRIVE%%HOMEPATH%\.nuget\packages -> appveyor.yml'
assets/files.wxs
+8
View File
@@ -2023,6 +2023,12 @@
<File Id="fil3779A5AC06BDD2A3AB680DBA83FEAFD1" KeyPath="yes" Source="$(env.ProductSourcePath)\zh-Hant\Microsoft.CodeAnalysis.resources.dll" />
</Component>
</Directory>
<Component Id="cmp7641086BD8244AFAAA244FAB40CE60BC" Guid="{2dc3fc9a-086e-4bae-85a4-03322c6a682f}">
<File Id="fil65BC2FC2686842A4B38CCBF9F54B2DD3" KeyPath="yes" Source="$(env.ProductSourcePath)\sos_$(var.FileArchitecture)_$(var.FileArchitecture)_4.6.26919.02.dll" />
</Component>
<Component Id="cmp2B1B284B631547EEB86D29E84D2E9611" Guid="{1d6e6de9-0af0-4669-9cf8-d731d43f3e8a}">
<File Id="fil1B414FC15B084BD9B4F5B1ACC5EC5084" KeyPath="yes" Source="$(env.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_4.6.26919.02.dll" />
</Component>
</DirectoryRef>
</Fragment>
<Fragment>
@@ -2672,6 +2678,8 @@
<ComponentRef Id="cmpC0582B8F392548248FA3DE3080069F68" />
<ComponentRef Id="cmp3D4940617EE5426384A6BF086E79CC63" />
<ComponentRef Id="cmpF13D9769FBE945B09326776DC9877740" />
<ComponentRef Id="cmp7641086BD8244AFAAA244FAB40CE60BC" />
<ComponentRef Id="cmp2B1B284B631547EEB86D29E84D2E9611" />
</ComponentGroup>
</Fragment>
</Wix>
global.json
+1 -1
View File
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "2.1.401"
"version": "2.1.403"
}
}
test/Test.Common.props
+1 -1
View File
@@ -5,7 +5,7 @@
<Copyright>(c) Microsoft Corporation. All rights reserved.</Copyright>
<TargetFramework>netcoreapp2.1</TargetFramework>
<RuntimeFrameworkVersion>2.1.3</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>2.1.5</RuntimeFrameworkVersion>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
test/tools/WebListener/WebListener.csproj
+1 -1
View File
@@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.3" />
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.5" />
</ItemGroup>
<ItemGroup>