Skip to content

Commit

Permalink
Move to .NET Core 3.1 preview 1 (PowerShell#10798)
Browse files Browse the repository at this point in the history
  • Loading branch information
@adityapatwardhan @kilasuit
adityapatwardhan authored and kilasuit committed Nov 9, 2019
1 parent 3b5107e commit 4c1aa49
Show file tree
Hide file tree
Showing 12 changed files with 27 additions and 43 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
View file
Expand Up @@ -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-preview1

# Avoid warnings by switching to noninteractive
ENV DEBIAN_FRONTEND=noninteractive
Expand Down
22 changes: 3 additions & 19 deletions assets/files.wxs
View file
Expand Up @@ -1640,9 +1640,6 @@
<Component Id="cmpF1B0E6DCC3BD4797B206C879EF270062" Guid="{af38a3e7-6bc2-47c8-a83e-ee8bfd0cc8be}">
<File Id="fil2694AE6F8EB8473CBDF0F73A4E55164B" KeyPath="yes" Source="$(env.ProductSourcePath)\ref\System.Text.Encoding.CodePages.dll" />
</Component>
<Component Id="cmp25A144CC34E545378735B06794A02F90" Guid="{35a3c141-1309-4277-9325-a97e177a9f09}">
<File Id="filFCE4A935DE1D4DD08E9A1D32A07E0266" KeyPath="yes" Source="$(env.ProductSourcePath)\ref\System.Drawing.dll" />
</Component>
</Directory>
<Directory Id="dirC72EEAF9434D4AD066E0F4D20D8E816C" Name="en-US">
<Component Id="cmpDC2EF4541FA5A2E63F36A8CD6C5FA51B" Guid="{CE8DDB7C-A16E-4A1E-80D5-9937D07A1723}">
Expand Down Expand Up @@ -3062,17 +3059,8 @@
<Component Id="cmpF6FDA6202E9D4CEF9F21A23D32571BFC" Guid="{e0776aa4-b3aa-4a15-a497-697b510fba8c}">
<File Id="fil9120D0A4381F4B34B80AB37D2EFBCF7D" KeyPath="yes" Source="$(env.ProductSourcePath)\InstallPSCorePolicyDefinitions.ps1" />
</Component>
<Component Id="cmp73A4CC8E2C9E4594A3D8258C9E00D7E6" Guid="{0aba3675-b1b5-4464-b8ed-937d3b9ea9ed}">
<File Id="fil8DBDCAE679714880A535D26FFE95A8F9" KeyPath="yes" Source="$(env.ProductSourcePath)\Microsoft.PowerShell.GraphicalHost.dll.config" />
</Component>
<Component Id="cmpAC984FA3A67247BC996F60290C87D0A1" Guid="{4ecc767e-b16c-45b8-8011-cc7374fccd5d}">
<File Id="fil1B9348FB24ED43DBAF5D977C7342C2B6" KeyPath="yes" Source="$(env.ProductSourcePath)\Microsoft.PowerShell.GraphicalHost.dll" />
</Component>
<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="cmpEC42F4F98D70437BB0E290A0E0FE1775" Guid="{5483092a-12c2-4e6c-b730-be491b8909c0}">
<File Id="filBE60A48C75214B7B810D695039AC47B5" KeyPath="yes" Source="$(env.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_4.700.19.50403.dll" />
</Component>
</DirectoryRef>
</Fragment>
Expand Down Expand Up @@ -3914,12 +3902,8 @@
<ComponentRef Id="cmp34649490F5B04041A08E73D7A86D5A5A" />
<ComponentRef Id="cmpB3116053008E492C9B36C89BF682B8F7" />
<ComponentRef Id="cmp859A3876902946E7B5B4965F90664C5D" />
<ComponentRef Id="cmpEC42F4F98D70437BB0E290A0E0FE1775" />
<ComponentRef Id="cmpF1B0E6DCC3BD4797B206C879EF270062" />
<ComponentRef Id="cmp73A4CC8E2C9E4594A3D8258C9E00D7E6" />
<ComponentRef Id="cmpAC984FA3A67247BC996F60290C87D0A1" />
<ComponentRef Id="cmp2E32A6E773F543F0A150B972F8D3E23A" />
<ComponentRef Id="cmp25A144CC34E545378735B06794A02F90" />
<ComponentRef Id="cmpCD1095120697449FA27BE5759D83F618" />
</ComponentGroup>
</Fragment>
</Wix>
2 changes: 1 addition & 1 deletion global.json
View file
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "3.1.100-preview2-014569"
"version": "3.1.100-preview1-014459"
}
}
2 changes: 1 addition & 1 deletion src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
View file
Expand Up @@ -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-preview1.19504.10" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
View file
Expand Up @@ -32,7 +32,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.3.1" />
<PackageReference Include="System.Threading.AccessControl" Version="4.6.0" />
<PackageReference Include="System.Threading.AccessControl" Version="4.7.0-preview1.19504.10" />
<PackageReference Include="NJsonSchema" Version="10.0.27" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
View file
Expand Up @@ -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-preview1.19504.10" />
</ItemGroup>

</Project>
6 changes: 3 additions & 3 deletions src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
View file
Expand Up @@ -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-preview1.19504.10" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="4.7.0-preview1.19504.10" />
<PackageReference Include="System.Text.Encodings.Web" Version="4.7.0-preview1.19504.10" />
<!-- 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" />
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
View file
Expand Up @@ -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-preview1.19504.10" />
</ItemGroup>

<PropertyGroup>
Expand Down
20 changes: 10 additions & 10 deletions src/System.Management.Automation/System.Management.Automation.csproj
View file
Expand Up @@ -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-preview1.19504.10" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0-preview1.19504.10" />
<PackageReference Include="System.DirectoryServices" Version="4.7.0-preview1.19504.10" />
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.7.0-preview1.19504.10" />
<PackageReference Include="System.Management" Version="4.7.0-preview1.19504.10" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.7.0-preview1.19504.10" />
<PackageReference Include="System.Security.AccessControl" Version="4.7.0-preview1.19504.10" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="4.7.0-preview1.19504.10" />
<PackageReference Include="System.Security.Permissions" Version="4.7.0-preview1.19504.10" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.0-preview1.19504.10" />
<!-- 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" />
Expand Down
4 changes: 2 additions & 2 deletions test/tools/WebListener/WebListener.csproj
View file
Expand Up @@ -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-preview1.19508.20" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.0-preview1.19504.10" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...erence/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
View file
Expand Up @@ -14,6 +14,6 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
<PackageReference Include="System.Security.AccessControl" Version="4.7.0-preview2.19523.17" />
<PackageReference Include="System.Security.AccessControl" Version="4.7.0-preview1.19504.10" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions ...aging/projects/reference/System.Management.Automation/System.Management.Automation.csproj
View file
Expand Up @@ -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-preview1.19504.10" />
<PackageReference Include="System.Security.Principal.Windows" Version="4.7.0-preview1.19504.10" />
</ItemGroup>
</Project>

0 comments on commit 4c1aa49

Please sign in to comment.