-
Notifications
You must be signed in to change notification settings - Fork 8.3k
Update to .NET 5 preview 8 #13530
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.
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
Update to .NET 5 preview 8 #13530
Changes from all commits
38b1959
7d4d658
6454dc3
f69b73a
6cba709
565ee11
2965760
3f21036
963117d
279c284
d0dcb72
b74c427
3da5c1f
228356b
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,8 @@ | ||
| { | ||
| "sdk": { | ||
| "channel": "release/5.0.1xx-preview7", | ||
| "packageVersionPattern": "5.0.0-preview.7", | ||
| "sdkImageVersion": "5.0.100-preview.7", | ||
| "nextChannel": "net5/preview7" | ||
| "channel": "release/5.0.1xx-preview8", | ||
| "packageVersionPattern": "5.0.0-preview.8", | ||
| "sdkImageVersion": "5.0.100-preview.8", | ||
| "nextChannel": "net5/preview8" | ||
| } | ||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| { | ||
| "sdk": { | ||
| "version": "5.0.100-preview.7.20366.15" | ||
| "version": "5.0.100-preview.8.20417.9" | ||
| } | ||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,13 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop" ToolsVersion="15.0"> | ||
| <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0"> | ||
| <Import Project="..\..\PowerShell.Common.props" /> | ||
| <PropertyGroup> | ||
| <Description>Assembly containing WPF code for Out-GridView, HelpWindow, and Show-Command</Description> | ||
| <NoWarn>$(NoWarn);CS1570</NoWarn> | ||
| <RootNamespace>Microsoft.Management.UI.Internal</RootNamespace> | ||
| <AssemblyName>Microsoft.PowerShell.GraphicalHost</AssemblyName> | ||
| <UseWPF>True</UseWPF> | ||
| <TargetPlatformIdentifier>Windows</TargetPlatformIdentifier> | ||
| <TargetPlatformVersion>7.0</TargetPlatformVersion> | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Just curious, what does the
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yes, that is the OS version
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We might have to have separate Win7 and Win10 packages as I think it's required to set this to 10 to pull in the WinRT packages
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can we try setting this to 10 in a private branch and see if that helps the WinRT issue?
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'm doing a local build to verify this
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think it is too late in the release to generate 2 packages for windows. We should do that for 7.2 if needed. |
||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup> | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,23 +11,11 @@ | |
| <RuntimeIdentifiers>win7-x86;win7-x64</RuntimeIdentifiers> | ||
| <RootNamespace>Microsoft.PowerShell</RootNamespace> | ||
| <ApplicationManifest>..\..\assets\pwsh.manifest</ApplicationManifest> | ||
| <TargetPlatformIdentifier>Windows</TargetPlatformIdentifier> | ||
| <TargetPlatformVersion>7.0</TargetPlatformVersion> | ||
| </PropertyGroup> | ||
|
|
||
| <!-- Have default so this builds in Visual Studio --> | ||
| <PropertyGroup Condition = "'$(SDKToUse)' == ''"> | ||
| <SDKToUse>Microsoft.NET.Sdk.WindowsDesktop</SDKToUse> | ||
| </PropertyGroup> | ||
|
|
||
| <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" Condition="'$(SDKToUse)' == 'Microsoft.NET.Sdk' " /> | ||
| <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" Condition="'$(SDKToUse)' == 'Microsoft.NET.Sdk' " /> | ||
|
|
||
| <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> | ||
| <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" /> | ||
|
|
||
| <ItemGroup> | ||
| <Compile Include="..\powershell\Program.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" /> | ||
|
|
@@ -64,4 +52,6 @@ | |
| <ProjectReference Include="..\Microsoft.Management.UI.Internal\Microsoft.PowerShell.GraphicalHost.csproj" Condition="'$(SDKToUse)' == 'Microsoft.NET.Sdk.WindowsDesktop' "/> | ||
| </ItemGroup> | ||
|
|
||
| <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" /> | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Shall we move this above next to
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We can try, but this was the recommendation from the .NET team member. |
||
|
|
||
| </Project> | ||
Uh oh!
There was an error while loading. Please reload this page.