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

Merged PR 7004: Update DotNet SDK and Runtime version

Browse Source 
Update DotNet SDK and Runtime version
Also update package versions
This commit is contained in:
Travis Plunk
2019-02-12 20:35:02 +00:00
parent 34f0ddff0a
commit f40eb9878f
11 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.vsts-ci/linux.yml
-1
View File
@@ -67,5 +67,4 @@ phases:
Write-Host "##vso[artifact.upload containerfolder=artifacts;artifactname=artifacts]$_"
}
displayName: Publish Artifacts
condition: ne(variables['Build.Reason'], 'PullRequest')
continueOnError: true
.vsts-ci/mac.yml
-1
View File
@@ -54,5 +54,4 @@ phases:
Write-Host "##vso[artifact.upload containerfolder=artifacts;artifactname=artifacts]$_"
}
displayName: Publish Artifacts
condition: ne(variables['Build.Reason'], 'PullRequest')
continueOnError: true
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.7</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>2.1.8</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.503
# cache version - netcoreapp.2.1-sdk.2.1.504
cache:
- '%HOMEDRIVE%%HOMEPATH%\.nuget\packages -> appveyor.yml'
assets/files.wxs
+6 -6
View File
@@ -1991,11 +1991,11 @@
<File Id="fil3779A5AC06BDD2A3AB680DBA83FEAFD1" KeyPath="yes" Source="$(env.ProductSourcePath)\zh-Hant\Microsoft.CodeAnalysis.resources.dll" />
</Component>
</Directory>
<Component Id="cmp10AF122D5AA4405C9AF34CE5176FB902" Guid="{16eeae06-da4d-4ec0-820e-2bb8d15f2043}">
<File Id="fil28523D69D2114BCD8D8A17FC1736C52C" KeyPath="yes" Source="$(env.ProductSourcePath)\sos_$(var.FileArchitecture)_$(var.FileArchitecture)_4.6.27129.04.dll" />
<Component Id="cmp12392353C58F4F708B7A4B1A8AA39BDA" Guid="{7b5965ed-4870-4fb6-81be-60cc67bb3dd1}">
<File Id="fil76544DCE870D4D1AA7DF2C4DCA9D9797" KeyPath="yes" Source="$(env.ProductSourcePath)\sos_$(var.FileArchitecture)_$(var.FileArchitecture)_4.6.27317.03.dll" />
</Component>
<Component Id="cmp51725753702E46DAACF4D0BB726E8B67" Guid="{75aa8c7c-e951-4916-bf69-8c6d38ce509d}">
<File Id="fil9795CF4538FF44E6B8E93C3B34FF5C0C" KeyPath="yes" Source="$(env.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_4.6.27129.04.dll" />
<Component Id="cmpF8E35BF1122540599B8B0621720F7BE5" Guid="{6edce74b-620d-4ab7-8fe4-6a1a1a83ac9e}">
<File Id="fil797C735308544F71AB4F7E49EC950BB0" KeyPath="yes" Source="$(env.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_4.6.27317.03.dll" />
</Component>
</DirectoryRef>
</Fragment>
@@ -2636,8 +2636,8 @@
<ComponentRef Id="cmpC0582B8F392548248FA3DE3080069F68" />
<ComponentRef Id="cmp3D4940617EE5426384A6BF086E79CC63" />
<ComponentRef Id="cmpF13D9769FBE945B09326776DC9877740" />
<ComponentRef Id="cmp10AF122D5AA4405C9AF34CE5176FB902" />
<ComponentRef Id="cmp51725753702E46DAACF4D0BB726E8B67" />
<ComponentRef Id="cmp12392353C58F4F708B7A4B1A8AA39BDA" />
<ComponentRef Id="cmpF8E35BF1122540599B8B0621720F7BE5" />
</ComponentGroup>
</Fragment>
</Wix>
global.json
+1 -1
View File
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "2.1.503"
"version": "2.1.504"
}
}
src/Microsoft.PowerShell.MarkdownRender/Microsoft.PowerShell.MarkdownRender.csproj
+1 -1
View File
@@ -9,7 +9,7 @@
<ItemGroup>
<!-- Source: https://github.com/lunet-io/markdig/ -->
<ProjectReference Include="../System.Management.Automation/System.Management.Automation.csproj" />
<PackageReference Include="Markdig.Signed" Version="0.15.6" />
<PackageReference Include="Markdig.Signed" Version="0.15.7" />
</ItemGroup>
</Project>
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.7</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>2.1.8</RuntimeFrameworkVersion>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
test/tools/Modules/HelpersCommon/HelpersCommon.psm1
+2 -5
View File
@@ -233,11 +233,8 @@ function Send-VstsLogFile {
Copy-Item -Path $Path -Destination $logFile
}
if($env:BUILD_REASON -ne 'PullRequest')
{
Write-Host "##vso[artifact.upload containerfolder=$name;artifactname=$name]$logFile"
Write-Verbose "Log file captured as $name" -Verbose
}
Write-Host "##vso[artifact.upload containerfolder=$name;artifactname=$name]$logFile"
Write-Verbose "Log file captured as $name" -Verbose
}
# Tests if the Linux or macOS user is root
test/tools/WebListener/WebListener.csproj
+1 -1
View File
@@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.7" />
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.8" />
</ItemGroup>
<ItemGroup>
tools/appveyor.psm1
+1 -1
View File
@@ -602,7 +602,7 @@ function Invoke-AppveyorFinish
{
Push-AppveyorArtifact $_
}
elseif ($env:TF_BUILD -and $env:BUILD_REASON -ne 'PullRequest') {
elseif ($env:TF_BUILD) {
# In VSTS
Write-Host "##vso[artifact.upload containerfolder=artifacts;artifactname=artifacts;]$_"
}