Skip to content

Revert "Revert nuget to 2.0.200609.3" - #796

Merged
Johan Laanstra (jlaanstra) merged 5 commits into
masterfrom
revert-793-nuget
Dec 15, 2020
Merged

Revert "Revert nuget to 2.0.200609.3"#796
Johan Laanstra (jlaanstra) merged 5 commits into
masterfrom
revert-793-nuget

Conversation

@jlaanstra

@jlaanstra Johan Laanstra (jlaanstra) commented Nov 16, 2020

Copy link
Copy Markdown
Contributor

Reverts #793 and adds the change from #794

Validate:

  • OS
  • Your Phone
  • Terminal
  • WinUI

@kennykerr Kenny Kerr (kennykerr) left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Waiting for validation. 😉

Comment thread nuget/CppWinrtRules.Project.xml Outdated

<BoolProperty Name="CppWinRTEnableDefaultPrivateFalse"
DisplayName="Enable Copy Local Defaults"
Description="Enables or disables the default for copying binaries to the output folder"

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Consider describing an example scenario where this would be useful.

Comment thread nuget/CppWinrtRules.Project.xml Outdated
@@ -0,0 +1,9 @@
namespace ConsoleApplication1
{
[default_interface]

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

remove, not needed (this class has a method)

@@ -0,0 +1,30 @@
========================================================================

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

consider deleting this file. does not help anyone

@kennykerr

Copy link
Copy Markdown
Collaborator

Chris Guzak (@ChrisGuzak) does this PR address #790?

@kennykerr

Copy link
Copy Markdown
Collaborator

Alex Bessonov (@AlexBAV) does this PR address #785?

@AlexBAV

Copy link
Copy Markdown

Alex Bessonov (@AlexBAV) does this PR address #785?

It looks like I found the reason for behavior described in #785. I've provided more information in the issue.

@jlaanstra

Copy link
Copy Markdown
Contributor Author

I'll probably won't be able to finish all the validation this week and I'm OOF next week. I'll finish this after Thanksgiving.

@kennykerr

Copy link
Copy Markdown
Collaborator

Julien Brianceau (@jbrianceau) does this PR address #809

@jbrianceau

Copy link
Copy Markdown
Member

Julien Brianceau (@jbrianceau) Julien Brianceau FTE does this PR address #809

No, I tried with the current 2.0.201113.7 nuget and overwrite CppWinrtRules.Project.xml, Microsoft.Windows.CppWinRT.props and Microsoft.Windows.CppWinRT.targets files using the ones from this PR and the problem is still there when trying to create the app package:

CSC : error CS0006: Metadata file 'D:\Work\CppWinRT_Test\App1\bin\x86\Debug\x64\RuntimeComponent1\RuntimeComponent1.winmd' could not be found [D:\Work\CppWinRT_Test\App1\App1.csproj]

@kennykerr

Kenny Kerr (kennykerr) commented Dec 3, 2020

Copy link
Copy Markdown
Collaborator

Fela (@FrayxRulez) does this PR address #813?

@jlaanstra

Copy link
Copy Markdown
Contributor Author

OS validation passed pending the fix for OS#30952588

@jlaanstra

Copy link
Copy Markdown
Contributor Author

WinUI build passed. Looking into a build error in Terminal.

@FrayxRulez

Copy link
Copy Markdown

Fela (@FrayxRulez) does this PR address #813?

Any easy way to try out?

@jlaanstra

Copy link
Copy Markdown
Contributor Author

Fela (@FrayxRulez) does this PR address #813?

Any easy way to try out?

Find the package on disk. Backup the props and targets files under the build folder. Replace those files with the ones from this PR.

@jlaanstra

Copy link
Copy Markdown
Contributor Author

Kenny Kerr (@kennykerr) All listed projects have passed validation with these changes.

@kennykerr

Copy link
Copy Markdown
Collaborator

All listed projects have passed validation with these changes.

Excellent! Just to clarify, did you test just the msbuild changes or cppwinrt as well?

Chris Guzak (@ChrisGuzak), Julien Brianceau (@jbrianceau) can you confirm this update works for you?

@jlaanstra

Copy link
Copy Markdown
Contributor Author

All listed projects have passed validation with these changes.

Excellent! Just to clarify, did you test just the msbuild changes or cppwinrt as well?

Chris Guzak (@ChrisGuzak), Julien Brianceau (@jbrianceau) can you confirm this update works for you?

I did just test the MSBuild changes, by manually replacing the props/targets files.

@jlaanstra

Copy link
Copy Markdown
Contributor Author

Note that this doesn't contain the fix for #809 yet. I'll be looking into that next.

@kennykerr

Copy link
Copy Markdown
Collaborator

I did just test the MSBuild changes, by manually replacing the props/targets files.

That's fine - I just got the latest cppwinrt working in the OS build so we should be good.

@kennykerr

Copy link
Copy Markdown
Collaborator

Note that this doesn't contain the fix for #809 yet. I'll be looking into that next.

Are you planning on doing that in this PR? Note that this will likely require re-validating everything. 😞

@jlaanstra

Copy link
Copy Markdown
Contributor Author

Note that this doesn't contain the fix for #809 yet. I'll be looking into that next.

Are you planning on doing that in this PR? Note that this will likely require re-validating everything. 😞

Fix is in #824. I'll merge this one and then do another round of validation with both changes.

@jlaanstra
Johan Laanstra (jlaanstra) merged commit ac252b2 into master Dec 15, 2020
@jlaanstra
Johan Laanstra (jlaanstra) deleted the revert-793-nuget branch December 15, 2020 23:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants