Skip to content

Move to .NET Core 3.0 preview.8 #10351

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TravisEz13 merged 6 commits into from
Aug 15, 2019
Merged

Move to .NET Core 3.0 preview.8 #10351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c225d50
move to .NET Core 3.0 preview
SteveL-MSFT Aug 13, 2019
eb6c769
update pkg ref versions
SteveL-MSFT Aug 13, 2019
34622c4
Update files.wxs
TravisEz13 Aug 13, 2019
550176a
missed two csproj files
SteveL-MSFT Aug 15, 2019
9f19e1e
revert changes to template update dotnet assembly versions
SteveL-MSFT Aug 15, 2019
8ff0cfb
Merge branch 'master' into netcore-preview8
TravisEz13 Aug 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
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.0.100-preview7
FROM mcr.microsoft.com/dotnet/core/sdk:3.0.100-preview8

# Avoid warnings by switching to noninteractive
ENV DEBIAN_FRONTEND=noninteractive
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// See https://aka.ms/vscode-remote/devcontainer.json for format details.
{
"name": ".NET Core 3.0-preview7, including pwsh (Debian 10)",
"name": ".NET Core 3.0-preview8, including pwsh (Debian 10)",
"dockerFile": "Dockerfile",

// Uncomment the next line to run commands after the container is created.
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ Temporary Items
# TestsResults
TestsResults*.xml
ParallelXUnitResults.xml
xUnitResults.xml

# Resharper settings
PowerShell.sln.DotSettings.user
Expand Down
8 changes: 4 additions & 4 deletions assets/files.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2922,9 +2922,6 @@
<Component Id="cmp30126C60BD784974B74EA45AE9B04032" Guid="{777d7afa-784b-4f16-9879-a6eada18d59f}">
<File Id="fil7352ABFC8A154701BFE3B47CFA66B8F4" KeyPath="yes" Source="$(env.ProductSourcePath)\System.Threading.Channels.dll" />
</Component>
<Component Id="cmpB6616472F56D49C0A092411F4D29EA8A" Guid="{3036bf65-f44a-4fb9-b802-01841bf587ed}">
<File Id="filFC27BBD7B6764674966AB7AEBC639982" KeyPath="yes" Source="$(env.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_4.700.19.32702.dll" />
</Component>
<Component Id="cmp9EC1507780D247E095EA92A7715B4BAC" Guid="{c111d60b-4bd3-4abc-b08c-1b503dde5931}">
<File Id="filFA98F788E7724D41A2A88F2C0298E691" KeyPath="yes" Source="$(env.ProductSourcePath)\System.Printing.dll" />
</Component>
Expand Down Expand Up @@ -3051,6 +3048,9 @@
<Component Id="cmp827B25EEC28D4699BB29042B273C8CBF" Guid="{f7ccc70c-5aaf-4e6b-bf9f-c59f4e631f9c}">
<File Id="filEF6B07EDBC8F43AE8DF88CFDF798FC22" KeyPath="yes" Source="$(env.ProductSourcePath)\System.ComponentModel.Composition.Registration.dll" />
</Component>
<Component Id="cmp45C246DB0A6548B88F0ECFAE7E04DDF9" Guid="{c0aa34fa-b8b3-4fdd-8ea9-0a7b552fd62a}">
<File Id="fil03DDF9C95E914AB68AE38D7B8AEF4BE9" KeyPath="yes" Source="$(env.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_4.700.19.37902.dll" />
</Component>
</DirectoryRef>
</Fragment>
<Fragment>
Expand Down Expand Up @@ -3624,7 +3624,6 @@
<ComponentRef Id="cmp0D4F53C257044BE1912BDD4E99A5F0DE" />
<ComponentRef Id="cmpEA40E9164309426C88C4388FDCA9559D" />
<ComponentRef Id="cmp30126C60BD784974B74EA45AE9B04032" />
<ComponentRef Id="cmpB6616472F56D49C0A092411F4D29EA8A" />
<ComponentRef Id="cmp9EC1507780D247E095EA92A7715B4BAC" />
<ComponentRef Id="cmpF2634E50875D4698921081E3C6B1D5DC" />
<ComponentRef Id="cmpDCAA22865EF8486AB7526E046A51DBF6" />
Expand Down Expand Up @@ -3888,6 +3887,7 @@
<ComponentRef Id="cmpAD1A205D445C43588868B205091DD390" />
<ComponentRef Id="cmpD7A187ADE66347E5A7550B96BA10D493" />
<ComponentRef Id="cmp827B25EEC28D4699BB29042B273C8CBF" />
<ComponentRef Id="cmp45C246DB0A6548B88F0ECFAE7E04DDF9" />
</ComponentGroup>
</Fragment>
</Wix>
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "3.0.100-preview7-012821"
"version": "3.0.100-preview8-013656"
}
}
2 changes: 1 addition & 1 deletion src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@

<ItemGroup>
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.ServiceProcess.ServiceController" Version="4.6.0-preview7.19362.9" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="4.6.0-preview8.19405.3" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.2.1" />
<PackageReference Include="System.Threading.AccessControl" Version="4.6.0-preview7.19362.9" />
<PackageReference Include="System.Threading.AccessControl" Version="4.6.0-preview8.19405.3" />
<PackageReference Include="NJsonSchema" Version="10.0.22" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
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.6.0-preview7.19362.9" />
<PackageReference Include="System.Diagnostics.EventLog" Version="4.6.0-preview8.19405.3" />
</ItemGroup>

</Project>
22 changes: 11 additions & 11 deletions src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,21 @@

<ItemGroup>
<!-- the following package(s) are from https://github.com/dotnet/fxdac -->
<PackageReference Include="System.Data.SqlClient" Version="4.7.0-preview7.19362.9" />
<PackageReference Include="System.Data.SqlClient" Version="4.7.0-preview8.19405.3" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.IO.Packaging" Version="4.6.0-preview7.19362.9" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="4.6.0-preview7.19362.9" />
<PackageReference Include="System.Text.Encodings.Web" Version="4.6.0-preview7.19362.9" />
<PackageReference Include="System.IO.Packaging" Version="4.6.0-preview8.19405.3" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="4.6.0-preview8.19405.3" />
<PackageReference Include="System.Text.Encodings.Web" Version="4.6.0-preview8.19405.3" />
<!-- the following package(s) are from https://github.com/dotnet/wcf -->
<PackageReference Include="System.ServiceModel.Duplex" Version="4.6.0-preview6.final" />
<PackageReference Include="System.ServiceModel.Http" Version="4.6.0-preview6.final" />
<PackageReference Include="System.ServiceModel.NetTcp" Version="4.6.0-preview6.final" />
<PackageReference Include="System.ServiceModel.Primitives" Version="4.6.0-preview6.final" />
<PackageReference Include="System.ServiceModel.Security" Version="4.6.0-preview6.final" />
<PackageReference Include="System.Private.ServiceModel" Version="4.6.0-preview6.final" />
<PackageReference Include="System.ServiceModel.Duplex" Version="4.6.0-preview8.final" />
<PackageReference Include="System.ServiceModel.Http" Version="4.6.0-preview8.final" />
<PackageReference Include="System.ServiceModel.NetTcp" Version="4.6.0-preview8.final" />
<PackageReference Include="System.ServiceModel.Primitives" Version="4.6.0-preview8.final" />
<PackageReference Include="System.ServiceModel.Security" Version="4.6.0-preview8.final" />
<PackageReference Include="System.Private.ServiceModel" Version="4.6.0-preview8.final" />
<!-- 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="3.0.0-preview7.19362.9" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="3.0.0-preview8.19405.3" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
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.6.0-preview7.19362.9" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="4.6.0-preview8.19405.3" />
</ItemGroup>

<PropertyGroup>
Expand Down
20 changes: 10 additions & 10 deletions src/System.Management.Automation/System.Management.Automation.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@
<!-- the following package(s) are from https://github.com/JamesNK/Newtonsoft.Json -->
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="4.6.0-preview7.19362.9" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.6.0-preview7.19362.9" />
<PackageReference Include="System.DirectoryServices" Version="4.6.0-preview7.19362.9" />
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.6.0-preview7.19362.9" />
<PackageReference Include="System.Management" Version="4.6.0-preview7.19362.9" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.6.0-preview7.19362.9" />
<PackageReference Include="System.Security.AccessControl" Version="4.6.0-preview7.19362.9" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="4.6.0-preview7.19362.9" />
<PackageReference Include="System.Security.Permissions" Version="4.6.0-preview7.19362.9" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.6.0-preview7.19362.9" />
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="4.6.0-preview8.19405.3" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.6.0-preview8.19405.3" />
<PackageReference Include="System.DirectoryServices" Version="4.6.0-preview8.19405.3" />
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.6.0-preview8.19405.3" />
<PackageReference Include="System.Management" Version="4.6.0-preview8.19405.3" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.6.0-preview8.19405.3" />
<PackageReference Include="System.Security.AccessControl" Version="4.6.0-preview8.19405.3" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="4.6.0-preview8.19405.3" />
<PackageReference Include="System.Security.Permissions" Version="4.6.0-preview8.19405.3" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.6.0-preview8.19405.3" />
<!-- the following package(s) are from the powershell org -->
<PackageReference Include="Microsoft.Management.Infrastructure" Version="1.0.0" />
<PackageReference Include="Microsoft.PowerShell.Native" Version="7.0.0-preview.1" />
Expand Down
2 changes: 1 addition & 1 deletion test/tools/WebListener/WebListener.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.0.0-preview6.19307.2" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.6.0-preview7.19362.9" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.6.0-preview8.19405.3" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...erence/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
<PackageReference Include="System.Security.AccessControl" Version="4.6.0-preview7.19362.9" />
<PackageReference Include="System.Security.AccessControl" Version="4.6.0-preview8.19405.3" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions ...aging/projects/reference/System.Management.Automation/System.Management.Automation.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Management.Infrastructure" Version="1.0.0" />
<PackageReference Include="System.Security.AccessControl" Version="4.6.0-preview.19113.10" />
<PackageReference Include="System.Security.Principal.Windows" Version="4.6.0-preview7.19362.9" />
<PackageReference Include="System.Security.AccessControl" Version="4.6.0-preview8.19405.3" />
<PackageReference Include="System.Security.Principal.Windows" Version="4.6.0-preview8.19405.3" />
</ItemGroup>
</Project>