-
Notifications
You must be signed in to change notification settings - Fork 667
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
WinUIGallery Submodule Update in WinUI3: Fixes #1802
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
63ee407
Remove UI TEsts from arm64ec
kythant d3212fc
Publish profiles'
kythant c2ca2ee
<PublishAot>false</PublishAot>
kythant 4a17446
Should be x64 config here
kythant 2b656e0
Update UItest's pubxml
kythant a4b28d8
Merge branch 'main' into user/kythant/WinUIGalleryUpdate
kythant fb5c1bc
don't need arm64ec in Platforms
kythant File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
19 changes: 19 additions & 0 deletions
19
WinUIGallery.UITests/Properties/PublishProfiles/win-arm64.pubxml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <!-- | ||
| https://go.microsoft.com/fwlink/?LinkID=208121. | ||
| --> | ||
| <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <PropertyGroup> | ||
| <PublishProtocol>FileSystem</PublishProtocol> | ||
| <Platform>ARM64</Platform> | ||
| <RuntimeIdentifier Condition="$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)')) >= 8">win-arm64</RuntimeIdentifier> | ||
| <RuntimeIdentifier Condition="$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)')) < 8">win10-arm64</RuntimeIdentifier> | ||
| <PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir> | ||
| <SelfContained>true</SelfContained> | ||
| <PublishSingleFile>False</PublishSingleFile> | ||
| <PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun> | ||
| <PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun> | ||
| <PublishTrimmed Condition="'$(Configuration)' == 'Debug'">False</PublishTrimmed> | ||
| <PublishTrimmed Condition="'$(Configuration)' != 'Debug'">True</PublishTrimmed> | ||
| </PropertyGroup> | ||
| </Project> |
19 changes: 19 additions & 0 deletions
19
WinUIGallery.UITests/Properties/PublishProfiles/win-arm64ec.pubxml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <!-- | ||
| https://go.microsoft.com/fwlink/?LinkID=208121. | ||
| --> | ||
| <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <PropertyGroup> | ||
| <PublishProtocol>FileSystem</PublishProtocol> | ||
| <Platform>x64</Platform> | ||
| <RuntimeIdentifier Condition="$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)')) >= 8">win-x64</RuntimeIdentifier> | ||
| <RuntimeIdentifier Condition="$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)')) < 8">win10-x64</RuntimeIdentifier> | ||
| <PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir> | ||
| <SelfContained>true</SelfContained> | ||
| <PublishSingleFile>False</PublishSingleFile> | ||
| <PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun> | ||
| <PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun> | ||
| <PublishTrimmed Condition="'$(Configuration)' == 'Debug'">False</PublishTrimmed> | ||
| <PublishTrimmed Condition="'$(Configuration)' != 'Debug'">True</PublishTrimmed> | ||
| </PropertyGroup> | ||
| </Project> | ||
19 changes: 19 additions & 0 deletions
19
WinUIGallery.UITests/Properties/PublishProfiles/win-x64.pubxml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <!-- | ||
| https://go.microsoft.com/fwlink/?LinkID=208121. | ||
| --> | ||
| <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <PropertyGroup> | ||
| <PublishProtocol>FileSystem</PublishProtocol> | ||
| <Platform>x64</Platform> | ||
| <RuntimeIdentifier Condition="$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)')) >= 8">win-x64</RuntimeIdentifier> | ||
| <RuntimeIdentifier Condition="$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)')) < 8">win10-x64</RuntimeIdentifier> | ||
| <PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir> | ||
| <SelfContained>true</SelfContained> | ||
| <PublishSingleFile>False</PublishSingleFile> | ||
| <PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun> | ||
| <PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun> | ||
| <PublishTrimmed Condition="'$(Configuration)' == 'Debug'">False</PublishTrimmed> | ||
| <PublishTrimmed Condition="'$(Configuration)' != 'Debug'">True</PublishTrimmed> | ||
| </PropertyGroup> | ||
| </Project> |
19 changes: 19 additions & 0 deletions
19
WinUIGallery.UITests/Properties/PublishProfiles/win-x86.pubxml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <!-- | ||
| https://go.microsoft.com/fwlink/?LinkID=208121. | ||
| --> | ||
| <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <PropertyGroup> | ||
| <PublishProtocol>FileSystem</PublishProtocol> | ||
| <Platform>x86</Platform> | ||
| <RuntimeIdentifier Condition="$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)')) >= 8">win-x86</RuntimeIdentifier> | ||
| <RuntimeIdentifier Condition="$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)')) < 8">win10-x86</RuntimeIdentifier> | ||
| <PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir> | ||
| <SelfContained>true</SelfContained> | ||
| <PublishSingleFile>False</PublishSingleFile> | ||
| <PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun> | ||
| <PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun> | ||
| <PublishTrimmed Condition="'$(Configuration)' == 'Debug'">False</PublishTrimmed> | ||
| <PublishTrimmed Condition="'$(Configuration)' != 'Debug'">True</PublishTrimmed> | ||
| </PropertyGroup> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| { | ||
| "profiles": { | ||
| "WinUIGallery.UITests (Package)": { | ||
| "commandName": "MsixPackage" | ||
| }, | ||
| "WinUIGallery.UITests (Unpackaged)": { | ||
| "commandName": "Project" | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
19 changes: 19 additions & 0 deletions
19
WinUIGallery.UnitTests/Properties/PublishProfiles/win-arm64ec.pubxml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <!-- | ||
| https://go.microsoft.com/fwlink/?LinkID=208121. | ||
| --> | ||
| <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <PropertyGroup> | ||
| <PublishProtocol>FileSystem</PublishProtocol> | ||
| <Platform>x64</Platform> | ||
| <RuntimeIdentifier Condition="$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)')) >= 8">win-x64</RuntimeIdentifier> | ||
| <RuntimeIdentifier Condition="$([MSBuild]::GetTargetFrameworkVersion('$(TargetFramework)')) < 8">win10-x64</RuntimeIdentifier> | ||
| <PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir> | ||
| <SelfContained>true</SelfContained> | ||
| <PublishSingleFile>False</PublishSingleFile> | ||
| <PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun> | ||
| <PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun> | ||
| <PublishTrimmed Condition="'$(Configuration)' == 'Debug'">False</PublishTrimmed> | ||
| <PublishTrimmed Condition="'$(Configuration)' != 'Debug'">True</PublishTrimmed> | ||
| </PropertyGroup> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why should ARM64-ec point to x64 and not ARM?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
arm64ec and x64 are interchangeable. Arm64ec is basically x64 under the hood but with arm64
We were also running into this error that setting the pubxml to point to x64 runtime identifier solves.
C:\ProgramFiles\dotnet\sdk\9.0.200\Sdks\Microsoft.NET.Sdk\targets\Microsoft.NET.Sdk.FrameworkReferenceResolution.targets(107,5): error NETSDK1083: The specified RuntimeIdentifier 'win-arm64ec' is not recognized. See https://aka.ms/netsdk1083 for more information. [C:__w\1\s\Samples\WinUIGallery\WinUIGallery.UnitTests\WinUIGallery.UnitTests.csproj]