Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Update to .NET 5 preview 8#13530

Merged
adityapatwardhan merged 14 commits intoPowerShell:masterfrom
rjmholt:dotnet-preview8
Aug 31, 2020
Merged

Update to .NET 5 preview 8#13530
adityapatwardhan merged 14 commits intoPowerShell:masterfrom
rjmholt:dotnet-preview8

Conversation

@rjmholt
Copy link
Collaborator

@rjmholt rjmholt commented Aug 27, 2020

PR Summary

Updates our .NET SDK dependency to 5-preview.8.

Also fixes issues with csproj files for powershell-win-core and GraphicalHost that blocked this update.

PR Checklist

<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" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shall we move this above next to <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />?

Copy link
Member

Choose a reason for hiding this comment

The 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.

<AssemblyName>Microsoft.PowerShell.GraphicalHost</AssemblyName>
<UseWPF>True</UseWPF>
<TargetPlatformIdentifier>Windows</TargetPlatformIdentifier>
<TargetPlatformVersion>7.0</TargetPlatformVersion>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just curious, what does the TargetPlatformVersion mean? Meaning targeting win-7?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, that is the OS version

Copy link
Member

Choose a reason for hiding this comment

The 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

Copy link
Member

Choose a reason for hiding this comment

The 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?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm doing a local build to verify this

Copy link
Member

Choose a reason for hiding this comment

The 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.

@rjmholt rjmholt marked this pull request as draft August 27, 2020 18:08
@rjmholt
Copy link
Collaborator Author

rjmholt commented Aug 27, 2020

Waiting on the wix file to generate

@ghost ghost added the Waiting on Author The PR was reviewed and requires changes or comments from the author before being accept label Aug 27, 2020
@ghost ghost removed the Waiting on Author The PR was reviewed and requires changes or comments from the author before being accept label Aug 27, 2020
@rjmholt rjmholt marked this pull request as ready for review August 27, 2020 18:17
@rjmholt rjmholt marked this pull request as draft August 27, 2020 18:52
@rjmholt

This comment has been minimized.

@rjmholt rjmholt marked this pull request as ready for review August 28, 2020 16:01
@adityapatwardhan adityapatwardhan added the CL-BuildPackaging Indicates that a PR should be marked as a build or packaging change in the Change Log label Aug 31, 2020
@adityapatwardhan adityapatwardhan added this to the 7.1.0-preview.7 milestone Aug 31, 2020
@adityapatwardhan adityapatwardhan merged commit 6a37eb9 into PowerShell:master Aug 31, 2020
@ghost
Copy link

ghost commented Sep 8, 2020

🎉v7.1.0-preview.7 has been released which incorporates this pull request.:tada:

Handy links:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CL-BuildPackaging Indicates that a PR should be marked as a build or packaging change in the Change Log

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants