mirrors/PowerShell
0
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell.git synced 2024-11-27 03:46:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Bump .NET core framework to 3.1-preview.3 (#11079)

Browse Source
This commit is contained in:
Aditya Patwardhan 2019-11-14 17:06:46 -08:00 committed by Travis Plunk
parent 9e02343b18
commit 8fcd772353
12 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.devcontainer/Dockerfile
View File

@ -3,7 +3,7 @@
# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
#-------------------------------------------------------------------------------------------------------------
FROM mcr.microsoft.com/dotnet/core/sdk:3.1.100-preview2
FROM mcr.microsoft.com/dotnet/core/sdk:3.1.100-preview3
# Avoid warnings by switching to noninteractive
ENV DEBIAN_FRONTEND=noninteractive

6
assets/files.wxs
View File

@ -3071,8 +3071,8 @@
<Component Id="cmp2E32A6E773F543F0A150B972F8D3E23A" Guid="{a43d0117-1193-4316-a0f6-fef892870f38}">
<File Id="fil66411B8941CA492E93BF262EA72C6BE6" KeyPath="yes" Source="$(env.ProductSourcePath)\Microsoft.PowerShell.GraphicalHost.xml" />
</Component>
<Component Id="cmpCD1095120697449FA27BE5759D83F618" Guid="{dac64ea2-13b9-409a-b215-974201244c9f}">
<File Id="filA48D09FB0F0C40E982B626C101698232" KeyPath="yes" Source="$(env.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_4.700.19.52202.dll" />
<Component Id="cmp62E7F775F1394EA6810AC0F13B3CF337" Guid="{f6f973db-9e30-41bb-8071-97ae55ddb3a0}">
<File Id="fil4F37E2767AB446D3A15F98B47F76466D" KeyPath="yes" Source="$(env.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_4.700.19.53102.dll" />
</Component>
</DirectoryRef>
</Fragment>
@ -3919,7 +3919,7 @@
<ComponentRef Id="cmpAC984FA3A67247BC996F60290C87D0A1" />
<ComponentRef Id="cmp2E32A6E773F543F0A150B972F8D3E23A" />
<ComponentRef Id="cmp25A144CC34E545378735B06794A02F90" />
<ComponentRef Id="cmpCD1095120697449FA27BE5759D83F618" />
<ComponentRef Id="cmp62E7F775F1394EA6810AC0F13B3CF337" />
</ComponentGroup>
</Fragment>
</Wix>

2
global.json
View File

@ -1,5 +1,5 @@
{
"sdk": {
"version": "3.1.100-preview2-014569"
"version": "3.1.100-preview3-014645"
}
}

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="4.7.0-preview2.19523.17" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="4.7.0-preview3.19551.4" />
</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.3.1" />
<PackageReference Include="System.Threading.AccessControl" Version="4.7.0-preview2.19523.17" />
<PackageReference Include="System.Drawing.Common" Version="4.7.0-preview2.19523.17" />
<PackageReference Include="System.Threading.AccessControl" Version="4.7.0-preview3.19551.4" />
<PackageReference Include="System.Drawing.Common" Version="4.7.0-preview3.19551.4" />
<PackageReference Include="NJsonSchema" Version="10.0.27" />
</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="4.7.0-preview2.19523.17" />
<PackageReference Include="System.Diagnostics.EventLog" Version="4.7.0-preview3.19551.4" />
</ItemGroup>
</Project>

6
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.0-preview1.19504.10" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.IO.Packaging" Version="4.7.0-preview2.19523.17" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="4.7.0-preview2.19523.17" />
<PackageReference Include="System.Text.Encodings.Web" Version="4.7.0-preview2.19523.17" />
<PackageReference Include="System.IO.Packaging" Version="4.7.0-preview3.19551.4" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="4.7.0-preview3.19551.4" />
<PackageReference Include="System.Text.Encodings.Web" Version="4.7.0-preview3.19551.4" />
<!-- the following package(s) are from https://github.com/dotnet/wcf -->
<PackageReference Include="System.ServiceModel.Duplex" Version="4.7.0-preview1.final" />
<PackageReference Include="System.ServiceModel.Http" Version="4.7.0-preview1.final" />

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="4.7.0-preview2.19523.17" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="4.7.0-preview3.19551.4" />
</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.11.0" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="4.7.0-preview2.19523.17" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0-preview2.19523.17" />
<PackageReference Include="System.DirectoryServices" Version="4.7.0-preview2.19523.17" />
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.7.0-preview2.19523.17" />
<PackageReference Include="System.Management" Version="4.7.0-preview2.19523.17" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.7.0-preview2.19523.17" />
<PackageReference Include="System.Security.AccessControl" Version="4.7.0-preview2.19523.17" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="4.7.0-preview2.19523.17" />
<PackageReference Include="System.Security.Permissions" Version="4.7.0-preview2.19523.17" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.0-preview2.19523.17" />
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="4.7.0-preview3.19551.4" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0-preview3.19551.4" />
<PackageReference Include="System.DirectoryServices" Version="4.7.0-preview3.19551.4" />
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.7.0-preview3.19551.4" />
<PackageReference Include="System.Management" Version="4.7.0-preview3.19551.4" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.7.0-preview3.19551.4" />
<PackageReference Include="System.Security.AccessControl" Version="4.7.0-preview3.19551.4" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="4.7.0-preview3.19551.4" />
<PackageReference Include="System.Security.Permissions" Version="4.7.0-preview3.19551.4" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.0-preview3.19551.4" />
<!-- the following package(s) are from the powershell org -->
<PackageReference Include="Microsoft.Management.Infrastructure" Version="2.0.0-preview.2" />
<PackageReference Include="Microsoft.PowerShell.Native" Version="7.0.0-preview.3" />

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

@ -7,8 +7,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.0-preview2.19528.8" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.0-preview2.19523.17" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.0-preview3.19555.2" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.0-preview3.19551.4" />
</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="4.7.0-preview2.19523.17" />
<PackageReference Include="System.Security.AccessControl" Version="4.7.0-preview3.19551.4" />
</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="1.0.0" />
<PackageReference Include="System.Security.AccessControl" Version="4.7.0-preview2.19523.17" />
<PackageReference Include="System.Security.Principal.Windows" Version="4.7.0-preview2.19523.17" />
<PackageReference Include="System.Security.AccessControl" Version="4.7.0-preview3.19551.4" />
<PackageReference Include="System.Security.Principal.Windows" Version="4.7.0-preview3.19551.4" />
</ItemGroup>
</Project>