Skip to content

Update .Net Core runtime from 3.0-preview6 to preview7 #10227

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
daxian-dbw merged 10 commits into from
Aug 5, 2019
Merged

Update .Net Core runtime from 3.0-preview6 to preview7 #10227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2cb9603
Use .Net Core 3 Preview 7
bergmeister Jul 24, 2019
e28ad56
Update MSI installer: .Net Core Runtime does not ship SOS dll any mor…
bergmeister Jul 25, 2019
f4128de
re-trigger CI (empty commit)
bergmeister Jul 25, 2019
5ac7534
Update out of band NuGet packages to preview7 as well except the ones…
bergmeister Jul 26, 2019
2c99458
re-trigger ci (empty commit)
bergmeister Jul 26, 2019
33d426a
Merge branch 'master' of https://github.com/PowerShell/PowerShell int…
bergmeister Jul 26, 2019
4d7ee92
re-trigger ci again (empty commit)
bergmeister Jul 26, 2019
1328656
add <UseWpf> and <UseWindowsForms> when using Desktop SDK
SteveL-MSFT Aug 4, 2019
144cacf
Merge branch 'master' into netcoreapp3.0-preview7
SteveL-MSFT Aug 4, 2019
0119e43
update files.wxs
SteveL-MSFT Aug 4, 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-preview6
FROM mcr.microsoft.com/dotnet/core/sdk:3.0.100-preview7

# 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-preview6, including pwsh (Debian 10)",
"name": ".NET Core 3.0-preview7, including pwsh (Debian 10)",
"dockerFile": "Dockerfile",

// Uncomment the next line to run commands after the container is created.
Expand Down
1,608 changes: 805 additions & 803 deletions assets/files.wxs
View file
Open in desktop

Large diffs are not rendered by default.

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-preview6-012264"
"version": "3.0.100-preview7-012821"
}
}
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.0" />
<PackageReference Include="System.Threading.AccessControl" Version="4.6.0-preview6.19303.8" />
<PackageReference Include="System.Threading.AccessControl" Version="4.6.0-preview7.19362.9" />
<PackageReference Include="NJsonSchema" Version="10.0.21" />
</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.Security.Principal.Windows" Version="4.6.0-preview6.19303.8" />
<PackageReference Include="System.Security.Principal.Windows" Version="4.6.0-preview7.19362.9" />
</ItemGroup>

</Project>
8 changes: 4 additions & 4 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,11 +16,11 @@

<ItemGroup>
<!-- the following package(s) are from https://github.com/dotnet/fxdac -->
<PackageReference Include="System.Data.SqlClient" Version="4.7.0-preview6.19303.8" />
<PackageReference Include="System.Data.SqlClient" Version="4.7.0-preview7.19362.9" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.IO.Packaging" Version="4.6.0-preview6.19303.8" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="4.6.0-preview6.19303.8" />
<PackageReference Include="System.Text.Encodings.Web" Version="4.6.0-preview6.19303.8" />
<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" />
<!-- 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" />
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 @@ -11,16 +11,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-preview6.19303.8" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.6.0-preview6.19303.8" />
<PackageReference Include="System.DirectoryServices" Version="4.6.0-preview6.19303.8" />
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.6.0-preview6.19303.8" />
<PackageReference Include="System.Management" Version="4.6.0-preview6.19303.8" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.6.0-preview6.19303.8" />
<PackageReference Include="System.Security.AccessControl" Version="4.6.0-preview6.19303.8" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="4.6.0-preview6.19303.8" />
<PackageReference Include="System.Security.Permissions" Version="4.6.0-preview6.19303.8" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.6.0-preview6.19303.8" />
<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" />
<!-- 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
5 changes: 5 additions & 0 deletions src/powershell-win-core/powershell-win-core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk.WindowsDesktop" Condition="'$(SDKToUse)' == 'Microsoft.NET.Sdk.WindowsDesktop' " />
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk.WindowsDesktop" Condition="'$(SDKToUse)' == 'Microsoft.NET.Sdk.WindowsDesktop' " />

<PropertyGroup Condition="'$(SDKToUse)' == 'Microsoft.NET.Sdk.WindowsDesktop' ">
<UseWpf>true</UseWpf>
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>

<ItemGroup>
<Compile Include="..\powershell\Program.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
<Content Include="..\System.Management.Automation\powershell.config.json">
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-preview6.19303.8" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.6.0-preview7.19362.9" />
</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-preview6.19303.8" />
<PackageReference Include="System.Security.AccessControl" Version="4.6.0-preview7.19362.9" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion ...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 @@ -10,6 +10,6 @@
<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-preview6.19303.8" />
<PackageReference Include="System.Security.Principal.Windows" Version="4.6.0-preview7.19362.9" />
</ItemGroup>
</Project>