maxmustermann/PowerShell
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update build to use the new .NET SDK 5.0.100-preview.4.20258.7 (#12637)

Browse source
This commit is contained in:
Dongbo Wang 2020-05-13 08:17:37 -07:00 committed by GitHub
parent 98b95e77ea
commit 935f84ee1d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 29 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
assets/files.wxs
View file

@ -3098,8 +3098,8 @@
<Component Id="cmpDBF82E0B595545C691EFDEA6D0A55EC2" Guid="{04a2d230-ce2e-4957-bc6d-e7794b88fae3}">
<File Id="filCE6DF8BB560F4785A4111E43CD9C14D7" KeyPath="yes" Source="$(env.ProductSourcePath)\api-ms-win-core-console-l1-2-0.dll" />
</Component>
<Component Id="cmp5D77F9D45B004ABE86B4740264F52117" Guid="{a64ec3c7-7097-48dc-88d8-1ba099716d74}">
<File Id="fil349DD627B88248BCADD4736536C35A5F" KeyPath="yes" Source="$(env.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_5.0.20.22709.dll" />
<Component Id="cmp09D3F0FF826A4CBEB4480AD2EC9720AC" Guid="{af62d3ce-a587-4e20-ac32-2ba264c171be}">
<File Id="filE2CC950CA4B8492D860AD430BFD08E83" KeyPath="yes" Source="$(env.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_5.0.20.25106.dll" />
</Component>
</DirectoryRef>
</Fragment>
@ -4098,8 +4098,8 @@
<ComponentRef Id="cmp70A5A090C6B94E8F8FC9B4AE5EC2969B" />
<ComponentRef Id="cmpD5CAB799D1E7463A92559D3D8E71172C" />
<ComponentRef Id="cmp10A3BA8FB6304CDE98FA8E6D57223EEF" />
<ComponentRef Id="cmp5D77F9D45B004ABE86B4740264F52117" />
<ComponentRef Id="cmpA57645B04E5F4D66AC598512C95AA1B9" />
<ComponentRef Id="cmp09D3F0FF826A4CBEB4480AD2EC9720AC" />
</ComponentGroup>
</Fragment>
</Wix>

2
global.json
View file

@ -1,5 +1,5 @@
{
"sdk": {
"version": "5.0.100-preview.4.20229.10"
"version": "5.0.100-preview.4.20258.7"
}
}

2
src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
View file

@ -47,7 +47,7 @@
<ItemGroup>
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.ServiceProcess.ServiceController" Version="5.0.0-preview.4.20227.9" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="5.0.0-preview.4.20251.6" />
</ItemGroup>
</Project>

4
src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
View file

@ -32,8 +32,8 @@
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.5.0" />
<PackageReference Include="System.Threading.AccessControl" Version="5.0.0-preview.4.20227.9" />
<PackageReference Include="System.Drawing.Common" Version="5.0.0-preview.4.20227.9" />
<PackageReference Include="System.Threading.AccessControl" Version="5.0.0-preview.4.20251.6" />
<PackageReference Include="System.Drawing.Common" Version="5.0.0-preview.4.20251.6" />
<PackageReference Include="NJsonSchema" Version="10.1.15" />
</ItemGroup>

2
src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
View file

@ -8,7 +8,7 @@
<ItemGroup>
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.Diagnostics.EventLog" Version="5.0.0-preview.4.20227.9" />
<PackageReference Include="System.Diagnostics.EventLog" Version="5.0.0-preview.4.20251.6" />
</ItemGroup>
</Project>

8
src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
View file

@ -18,9 +18,9 @@
<!-- the following package(s) are from https://github.com/dotnet/fxdac -->
<PackageReference Include="System.Data.SqlClient" Version="4.8.1" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.IO.Packaging" Version="5.0.0-preview.4.20227.9" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="5.0.0-preview.4.20227.9" />
<PackageReference Include="System.Text.Encodings.Web" Version="5.0.0-preview.4.20227.9" />
<PackageReference Include="System.IO.Packaging" Version="5.0.0-preview.4.20251.6" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="5.0.0-preview.4.20251.6" />
<PackageReference Include="System.Text.Encodings.Web" Version="5.0.0-preview.4.20251.6" />
<!-- the following package(s) are from https://github.com/dotnet/wcf -->
<PackageReference Include="System.ServiceModel.Duplex" Version="4.7.0" />
<PackageReference Include="System.ServiceModel.Http" Version="4.7.0" />
@ -30,7 +30,7 @@
<PackageReference Include="System.Private.ServiceModel" Version="4.7.0" />
<!-- 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="5.0.0-preview.4.20227.9" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="5.0.0-preview.4.20251.6" />
</ItemGroup>
</Project>

2
src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
View file

@ -9,7 +9,7 @@
<ProjectReference Include="..\System.Management.Automation\System.Management.Automation.csproj" />
<ProjectReference Include="..\Microsoft.WSMan.Runtime\Microsoft.WSMan.Runtime.csproj" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.ServiceProcess.ServiceController" Version="5.0.0-preview.4.20227.9" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="5.0.0-preview.4.20251.6" />
</ItemGroup>
<PropertyGroup>

20
src/System.Management.Automation/System.Management.Automation.csproj
View file

@ -16,16 +16,16 @@
<!-- the Application Insights package -->
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.14.0" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="5.0.0-preview.4.20227.9" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0-preview.4.20227.9" />
<PackageReference Include="System.DirectoryServices" Version="5.0.0-preview.4.20227.9" />
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0-preview.4.20227.9" />
<PackageReference Include="System.Management" Version="5.0.0-preview.4.20227.9" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0-preview.4.20227.9" />
<PackageReference Include="System.Security.AccessControl" Version="5.0.0-preview.4.20227.9" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="5.0.0-preview.4.20227.9" />
<PackageReference Include="System.Security.Permissions" Version="5.0.0-preview.4.20227.9" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0-preview.4.20227.9" />
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="5.0.0-preview.4.20251.6" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0-preview.4.20251.6" />
<PackageReference Include="System.DirectoryServices" Version="5.0.0-preview.4.20251.6" />
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0-preview.4.20251.6" />
<PackageReference Include="System.Management" Version="5.0.0-preview.4.20251.6" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0-preview.4.20251.6" />
<PackageReference Include="System.Security.AccessControl" Version="5.0.0-preview.4.20251.6" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="5.0.0-preview.4.20251.6" />
<PackageReference Include="System.Security.Permissions" Version="5.0.0-preview.4.20251.6" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0-preview.4.20251.6" />
<!-- the following package(s) are from the powershell org -->
<PackageReference Include="Microsoft.Management.Infrastructure" Version="2.0.0" />
<PackageReference Include="Microsoft.PowerShell.Native" Version="7.0.0" />

2
test/tools/TestService/TestService.csproj
View file

@ -12,7 +12,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Windows.Compatibility" Version="5.0.0-preview.4.20227.9" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="5.0.0-preview.4.20251.6" />
</ItemGroup>
</Project>

4
test/tools/WebListener/WebListener.csproj
View file

@ -7,8 +7,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.0-preview.4.20228.15" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0-preview.4.20227.9" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.0-preview.4.20257.10" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0-preview.4.20251.6" />
</ItemGroup>
<ItemGroup>

2
tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
View file

@ -14,6 +14,6 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="System.Security.AccessControl" Version="5.0.0-preview.4.20227.9" />
<PackageReference Include="System.Security.AccessControl" Version="5.0.0-preview.4.20251.6" />
</ItemGroup>
</Project>

4
tools/packaging/projects/reference/System.Management.Automation/System.Management.Automation.csproj
View file

@ -9,7 +9,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Management.Infrastructure" Version="2.0.0" />
<PackageReference Include="System.Security.AccessControl" Version="5.0.0-preview.4.20227.9" />
<PackageReference Include="System.Security.Principal.Windows" Version="5.0.0-preview.4.20227.9" />
<PackageReference Include="System.Security.AccessControl" Version="5.0.0-preview.4.20251.6" />
<PackageReference Include="System.Security.Principal.Windows" Version="5.0.0-preview.4.20251.6" />
</ItemGroup>
</Project>