update to latest package references, runtime framework, and SDK (#7272)
* update to latest package references * update runtime framework * update sdk * automatically read NuGet package dependency info from csproj, where version info is fully qualified * update file.wxs
This commit is contained in:
Travis Plunk
Ilya
parent
75ba74cce6
commit
b15709f444
|
|
@ -61,7 +61,7 @@ after_success:
|
|||
# which is expensive and unneeded for build agents.
|
||||
env:
|
||||
global:
|
||||
- CACHE_VERSION=netcoreapp.2.1-sdk.2.1.301
|
||||
- CACHE_VERSION=netcoreapp.2.1-sdk.2.1.302
|
||||
- POWERSHELL_TELEMETRY_OPTOUT=1
|
||||
- DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
|
||||
|
||||
|
|
|
|||
|
|
@ -94,7 +94,7 @@
|
|||
<Copyright>(c) Microsoft Corporation. All rights reserved.</Copyright>
|
||||
|
||||
<TargetFramework>netcoreapp2.1</TargetFramework>
|
||||
<RuntimeFrameworkVersion>2.1.1</RuntimeFrameworkVersion>
|
||||
<RuntimeFrameworkVersion>2.1.2</RuntimeFrameworkVersion>
|
||||
<LangVersion>Latest</LangVersion>
|
||||
|
||||
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
|
||||
|
|
@ -118,7 +118,7 @@
|
|||
<PropertyGroup Condition=" '$(IsWindows)' != 'true' ">
|
||||
<DefineConstants>$(DefineConstants);UNIX</DefineConstants>
|
||||
</PropertyGroup>
|
||||
|
||||
|
||||
<!-- Define all OS, debug configuration properties -->
|
||||
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
|
||||
<DebugType>portable</DebugType>
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ environment:
|
|||
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
|
||||
Purpose: ElevatedPesterTests_xUnit_Packaging
|
||||
|
||||
# cache version - netcoreapp.2.1-sdk.2.1.301
|
||||
# cache version - netcoreapp.2.1-sdk.2.1.302
|
||||
cache:
|
||||
- '%HOMEDRIVE%%HOMEPATH%\.nuget\packages -> appveyor.yml'
|
||||
|
||||
|
|
|
|||
|
|
@ -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="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 Id="cmp9C01EB4ABD5E45E99A578811CBA32639" Guid="{09C9310D-56AD-4F7A-90C8-DF0F7E8A7251}">
|
||||
<File Id="filDDE80F6ACEC54B56BA33E587A072DE27" KeyPath="yes" Source="$(env.ProductSourcePath)\sos_$(var.FileArchitecture)_$(var.FileArchitecture)_4.6.26628.05.dll" />
|
||||
</Component>
|
||||
<Component Id="cmp5977DC14DE00AD6E597A2FEBB8C3B58B" Guid="{8E01E3C2-0596-46D8-95DD-BCA308A88941}">
|
||||
<File Id="filEE7925E7A712381B024DAE39831F7AEB" KeyPath="yes" Source="$(env.ProductSourcePath)\System.Threading.dll" />
|
||||
|
|
@ -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="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 Id="cmp2C8A6F940411401A9A6EFF6CD7F4A8C8" Guid="{8B8505AA-27B2-4244-A1C3-1E5952D64B64}">
|
||||
<File Id="fil87A274531F374FB186928D7A3B28F54F" KeyPath="yes" Source="$(env.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_4.6.26628.05.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" />
|
||||
|
|
@ -1981,7 +1981,7 @@
|
|||
<ComponentRef Id="cmp23FD946C6681D6747F1B638ECBE8C8BC" />
|
||||
<ComponentRef Id="cmp4B935A8190C2D7D1F0E0DB9E5AAD7F30" />
|
||||
<ComponentRef Id="cmp2B60F4AC2E8D95A558C3E121A6252D37" />
|
||||
<ComponentRef Id="cmp94BBA02944344967A5B4ABEDB5E5AD21" />
|
||||
<ComponentRef Id="cmp9C01EB4ABD5E45E99A578811CBA32639" />
|
||||
<ComponentRef Id="cmp5977DC14DE00AD6E597A2FEBB8C3B58B" />
|
||||
<ComponentRef Id="cmp689C7CE34E0246D8B56D370E898354CE" />
|
||||
<ComponentRef Id="cmp634E012FEF6122735D91DE4B1BCC1116" />
|
||||
|
|
@ -2080,7 +2080,7 @@
|
|||
<ComponentRef Id="cmpE66ABF016916C709133CA0DB9366469F" />
|
||||
<ComponentRef Id="cmpECCD26D8C540FA35F5C633B318EB742E" />
|
||||
<ComponentRef Id="cmp644DFED4A59040568D091F0EA5F691E6" />
|
||||
<ComponentRef Id="cmpFACAD92324CA40CAB89EFD08A5EE1BCB" />
|
||||
<ComponentRef Id="cmp2C8A6F940411401A9A6EFF6CD7F4A8C8" />
|
||||
<ComponentRef Id="cmpCC989C2FC3319628C5A0897A9CDB4C7D" />
|
||||
<ComponentRef Id="cmpC9085D713FC071587C61ACFE51384BDD" />
|
||||
<ComponentRef Id="cmpB942FEF3BC11F835DF30CDDD845486AD" />
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"sdk": {
|
||||
"version": "2.1.301"
|
||||
"version": "2.1.302"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@
|
|||
<ItemGroup>
|
||||
<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" />
|
||||
<PackageReference Include="NJsonSchema" Version="9.10.63" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -23,12 +23,12 @@
|
|||
<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.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" />
|
||||
<PackageReference Include="System.ServiceModel.Duplex" Version="4.5.2" />
|
||||
<PackageReference Include="System.ServiceModel.Http" Version="4.5.2" />
|
||||
<PackageReference Include="System.ServiceModel.NetTcp" Version="4.5.2" />
|
||||
<PackageReference Include="System.ServiceModel.Primitives" Version="4.5.2" />
|
||||
<PackageReference Include="System.ServiceModel.Security" Version="4.5.2" />
|
||||
<PackageReference Include="System.Private.ServiceModel" Version="4.5.2" />
|
||||
<!-- 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" />
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<Copyright>(c) Microsoft Corporation. All rights reserved.</Copyright>
|
||||
|
||||
<TargetFramework>netcoreapp2.1</TargetFramework>
|
||||
<RuntimeFrameworkVersion>2.1.1</RuntimeFrameworkVersion>
|
||||
<RuntimeFrameworkVersion>2.1.2</RuntimeFrameworkVersion>
|
||||
|
||||
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
|
||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.1" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.2" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -1496,21 +1496,33 @@ function New-UnifiedNugetPackage
|
|||
|
||||
'Microsoft.PowerShell.Commands.Management' {
|
||||
$deps.Add([tuple]::Create([tuple]::Create('id', 'Microsoft.PowerShell.Security'), [tuple]::Create('version', $PackageVersion))) > $null
|
||||
$deps.Add([tuple]::Create([tuple]::Create('id', 'System.ServiceProcess.ServiceController'), [tuple]::Create('version', '4.5.0'))) > $null
|
||||
foreach($packageInfo in (Get-ProjectPackageInformation -ProjectName $fileBaseName))
|
||||
{
|
||||
$deps.Add([tuple]::Create([tuple]::Create('id', $packageInfo.Name), [tuple]::Create('version', $packageInfo.Version))) > $null
|
||||
}
|
||||
}
|
||||
|
||||
'Microsoft.PowerShell.Commands.Utility' {
|
||||
$deps.Add([tuple]::Create([tuple]::Create('id', 'System.Management.Automation'), [tuple]::Create('version', $PackageVersion))) > $null
|
||||
$deps.Add([tuple]::Create([tuple]::Create('id', 'Microsoft.CodeAnalysis.CSharp'), [tuple]::Create('version', '2.7.0'))) > $null
|
||||
foreach($packageInfo in (Get-ProjectPackageInformation -ProjectName $fileBaseName))
|
||||
{
|
||||
$deps.Add([tuple]::Create([tuple]::Create('id', $packageInfo.Name), [tuple]::Create('version', $packageInfo.Version))) > $null
|
||||
}
|
||||
}
|
||||
|
||||
'Microsoft.PowerShell.ConsoleHost' {
|
||||
$deps.Add([tuple]::Create( [tuple]::Create('id', 'System.Management.Automation'), [tuple]::Create('version', $PackageVersion))) > $null
|
||||
$deps.Add([tuple]::Create( [tuple]::Create('id', 'Microsoft.ApplicationInsights'), [tuple]::Create('version', '2.4.0'))) > $null
|
||||
foreach($packageInfo in (Get-ProjectPackageInformation -ProjectName $fileBaseName))
|
||||
{
|
||||
$deps.Add([tuple]::Create([tuple]::Create('id', $packageInfo.Name), [tuple]::Create('version', $packageInfo.Version))) > $null
|
||||
}
|
||||
}
|
||||
|
||||
'Microsoft.PowerShell.CoreCLR.Eventing' {
|
||||
$deps.Add([tuple]::Create( [tuple]::Create('id', 'System.Security.Principal.Windows'), [tuple]::Create('version', '4.5.0'))) > $null
|
||||
foreach($packageInfo in (Get-ProjectPackageInformation -ProjectName $fileBaseName))
|
||||
{
|
||||
$deps.Add([tuple]::Create([tuple]::Create('id', $packageInfo.Name), [tuple]::Create('version', $packageInfo.Version))) > $null
|
||||
}
|
||||
}
|
||||
|
||||
'Microsoft.PowerShell.SDK' {
|
||||
|
|
@ -1519,20 +1531,10 @@ function New-UnifiedNugetPackage
|
|||
$deps.Add([tuple]::Create([tuple]::Create('id', 'Microsoft.PowerShell.ConsoleHost'), [tuple]::Create('version', $PackageVersion))) > $null
|
||||
$deps.Add([tuple]::Create([tuple]::Create('id', 'Microsoft.PowerShell.Security'), [tuple]::Create('version', $PackageVersion))) > $null
|
||||
$deps.Add([tuple]::Create([tuple]::Create('id', 'System.Management.Automation'), [tuple]::Create('version', $PackageVersion))) > $null
|
||||
$deps.Add([tuple]::Create([tuple]::Create('id', 'System.Data.SqlClient'), [tuple]::Create('version', '4.5.0'))) > $null
|
||||
$deps.Add([tuple]::Create([tuple]::Create('id', 'System.IO.Packaging'), [tuple]::Create('version', '4.5.0'))) > $null
|
||||
$deps.Add([tuple]::Create([tuple]::Create('id', 'System.Net.Http.WinHttpHandler'), [tuple]::Create('version', '4.5.0'))) > $null
|
||||
$deps.Add([tuple]::Create([tuple]::Create('id', 'System.ServiceModel.Duplex'), [tuple]::Create('version', '4.5.0'))) > $null
|
||||
$deps.Add([tuple]::Create([tuple]::Create('id', 'System.ServiceModel.Http'), [tuple]::Create('version', '4.5.0'))) > $null
|
||||
$deps.Add([tuple]::Create([tuple]::Create('id', 'System.ServiceModel.NetTcp'), [tuple]::Create('version', '4.5.0'))) > $null
|
||||
$deps.Add([tuple]::Create([tuple]::Create('id', 'System.ServiceModel.Primitives'), [tuple]::Create('version', '4.5.0'))) > $null
|
||||
$deps.Add([tuple]::Create([tuple]::Create('id', 'System.ServiceModel.Security'), [tuple]::Create('version', '4.5.0'))) > $null
|
||||
$deps.Add([tuple]::Create([tuple]::Create('id', 'System.Text.Encodings.Web'), [tuple]::Create('version', '4.5.0'))) > $null
|
||||
$deps.Add([tuple]::Create([tuple]::Create('id', 'System.Threading.AccessControl'), [tuple]::Create('version', '4.5.0'))) > $null
|
||||
$deps.Add([tuple]::Create([tuple]::Create('id', 'System.Private.ServiceModel'), [tuple]::Create('version', '4.5.0'))) > $null
|
||||
$deps.Add([tuple]::Create([tuple]::Create('id', 'Microsoft.NETCore.Windows.ApiSets'), [tuple]::Create('version', '1.0.1'))) > $null
|
||||
$deps.Add([tuple]::Create([tuple]::Create('id', 'Microsoft.WSMan.Management'), [tuple]::Create('version', $PackageVersion))) > $null
|
||||
$deps.Add([tuple]::Create([tuple]::Create('id', 'Microsoft.PowerShell.Commands.Diagnostics'), [tuple]::Create('version', $PackageVersion))) > $null
|
||||
foreach($packageInfo in (Get-ProjectPackageInformation -ProjectName $fileBaseName))
|
||||
{
|
||||
$deps.Add([tuple]::Create([tuple]::Create('id', $packageInfo.Name), [tuple]::Create('version', $packageInfo.Version))) > $null
|
||||
}
|
||||
}
|
||||
|
||||
'Microsoft.PowerShell.Security' {
|
||||
|
|
@ -1542,7 +1544,10 @@ function New-UnifiedNugetPackage
|
|||
'Microsoft.WSMan.Management' {
|
||||
$deps.Add([tuple]::Create([tuple]::Create('id', 'System.Management.Automation'), [tuple]::Create('version', $PackageVersion))) > $null
|
||||
$deps.Add([tuple]::Create([tuple]::Create('id', 'Microsoft.WSMan.Runtime'), [tuple]::Create('version', $PackageVersion))) > $null
|
||||
$deps.Add([tuple]::Create([tuple]::Create('id', 'System.ServiceProcess.ServiceController'), [tuple]::Create('version', '4.5.0'))) > $null
|
||||
foreach($packageInfo in (Get-ProjectPackageInformation -ProjectName $fileBaseName))
|
||||
{
|
||||
$deps.Add([tuple]::Create([tuple]::Create('id', $packageInfo.Name), [tuple]::Create('version', $packageInfo.Version))) > $null
|
||||
}
|
||||
}
|
||||
|
||||
'Microsoft.WSMan.Runtime' {
|
||||
|
|
@ -1551,13 +1556,11 @@ function New-UnifiedNugetPackage
|
|||
|
||||
'System.Management.Automation' {
|
||||
$deps.Add([tuple]::Create([tuple]::Create('id', 'Microsoft.PowerShell.CoreCLR.Eventing'), [tuple]::Create('version', $PackageVersion))) > $null
|
||||
$deps.Add([tuple]::Create([tuple]::Create('id', 'Microsoft.Win32.Registry.AccessControl'), [tuple]::Create('version', '4.5.0'))) > $null
|
||||
$deps.Add([tuple]::Create([tuple]::Create('id', 'Newtonsoft.Json'), [tuple]::Create('version', '10.0.3'))) > $null
|
||||
$deps.Add([tuple]::Create([tuple]::Create('id', 'System.IO.FileSystem.AccessControl'), [tuple]::Create('version', '4.5.0'))) > $null
|
||||
$deps.Add([tuple]::Create([tuple]::Create('id', 'System.Security.AccessControl'), [tuple]::Create('version', '4.5.0'))) > $null
|
||||
$deps.Add([tuple]::Create([tuple]::Create('id', 'System.Security.Cryptography.Pkcs'), [tuple]::Create('version', '4.5.0'))) > $null
|
||||
$deps.Add([tuple]::Create([tuple]::Create('id', 'System.Security.Permissions'), [tuple]::Create('version', '4.5.0'))) > $null
|
||||
$deps.Add([tuple]::Create([tuple]::Create('id', 'System.Text.Encoding.CodePages'), [tuple]::Create('version', '4.3.0'))) > $null
|
||||
foreach($packageInfo in (Get-ProjectPackageInformation -ProjectName $fileBaseName))
|
||||
{
|
||||
$deps.Add([tuple]::Create([tuple]::Create('id', $packageInfo.Name), [tuple]::Create('version', $packageInfo.Version))) > $null
|
||||
}
|
||||
|
||||
$deps.Add([tuple]::Create([tuple]::Create('id', 'Microsoft.Management.Infrastructure'), [tuple]::Create('version', '1.0.0-alpha08'))) > $null
|
||||
$deps.Add([tuple]::Create([tuple]::Create('id', 'PowerShell.Core.Instrumentation'), [tuple]::Create('version', '6.0.0-RC2'))) > $null
|
||||
$deps.Add([tuple]::Create([tuple]::Create('id', 'libpsl'), [tuple]::Create('version', '6.0.0-rc'))) > $null
|
||||
|
|
@ -1580,6 +1583,41 @@ function New-UnifiedNugetPackage
|
|||
}
|
||||
}
|
||||
|
||||
<#
|
||||
.SYNOPSIS
|
||||
Return the list of packages and versions used by a project
|
||||
|
||||
.PARAMETER ProjectName
|
||||
The name of the project to get the projects for.
|
||||
#>
|
||||
function Get-ProjectPackageInformation
|
||||
{
|
||||
param(
|
||||
[Parameter(Mandatory = $true)]
|
||||
[string]
|
||||
$ProjectName
|
||||
)
|
||||
|
||||
$csproj = "$PSScriptRoot\..\..\src\$ProjectName\$ProjectName.csproj"
|
||||
[xml] $csprojXml = (Get-content -Raw -Path $csproj)
|
||||
|
||||
# get the package references
|
||||
$packages=$csprojXml.Project.ItemGroup.PackageReference
|
||||
|
||||
# check to see if there is a newer package for each refernce
|
||||
foreach($package in $packages)
|
||||
{
|
||||
if($package.Version -notmatch '\*' -and $package.Include)
|
||||
{
|
||||
# Get the name of the package
|
||||
[PSCustomObject] @{
|
||||
Name = $package.Include
|
||||
Version = $package.Version
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
<#
|
||||
.SYNOPSIS
|
||||
Creates a nuspec file.
|
||||
|
|
|
|||
Loading…
Reference in a new issue