-
-
Notifications
You must be signed in to change notification settings - Fork 1.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2628 from jeromelaban/dev/jela/uno4
- Loading branch information
Showing
9 changed files
with
99 additions
and
106 deletions.
There are no files selected for viewing
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
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
127 changes: 55 additions & 72 deletions
127
e2e/Uno/WinUI/HelloUnoWorld.Windows.Package/HelloUnoWorld.Windows.Package.wapproj
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 |
|---|---|---|
| @@ -1,92 +1,75 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project ToolsVersion="15.0" | ||
| DefaultTargets="Build" | ||
| xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' < '15.0'"> | ||
| <VisualStudioVersion>15.0</VisualStudioVersion> | ||
| <VisualStudioVersion>15.0</VisualStudioVersion> | ||
| </PropertyGroup> | ||
| <ItemGroup Label="ProjectConfigurations"> | ||
| <ProjectConfiguration Include="Debug|x86"> | ||
| <Configuration>Debug</Configuration> | ||
| <Platform>x86</Platform> | ||
| </ProjectConfiguration> | ||
| <ProjectConfiguration Include="Release|x86"> | ||
| <Configuration>Release</Configuration> | ||
| <Platform>x86</Platform> | ||
| </ProjectConfiguration> | ||
| <ProjectConfiguration Include="Debug|x64"> | ||
| <Configuration>Debug</Configuration> | ||
| <Platform>x64</Platform> | ||
| </ProjectConfiguration> | ||
| <ProjectConfiguration Include="Release|x64"> | ||
| <Configuration>Release</Configuration> | ||
| <Platform>x64</Platform> | ||
| </ProjectConfiguration> | ||
| <ProjectConfiguration Include="Debug|arm64"> | ||
| <Configuration>Debug</Configuration> | ||
| <Platform>arm64</Platform> | ||
| </ProjectConfiguration> | ||
| <ProjectConfiguration Include="Release|arm64"> | ||
| <Configuration>Release</Configuration> | ||
| <Platform>arm64</Platform> | ||
| </ProjectConfiguration> | ||
| <ProjectConfiguration Include="Debug|x86"> | ||
| <Configuration>Debug</Configuration> | ||
| <Platform>x86</Platform> | ||
| </ProjectConfiguration> | ||
| <ProjectConfiguration Include="Release|x86"> | ||
| <Configuration>Release</Configuration> | ||
| <Platform>x86</Platform> | ||
| </ProjectConfiguration> | ||
| <ProjectConfiguration Include="Debug|x64"> | ||
| <Configuration>Debug</Configuration> | ||
| <Platform>x64</Platform> | ||
| </ProjectConfiguration> | ||
| <ProjectConfiguration Include="Release|x64"> | ||
| <Configuration>Release</Configuration> | ||
| <Platform>x64</Platform> | ||
| </ProjectConfiguration> | ||
| <ProjectConfiguration Include="Debug|arm64"> | ||
| <Configuration>Debug</Configuration> | ||
| <Platform>arm64</Platform> | ||
| </ProjectConfiguration> | ||
| <ProjectConfiguration Include="Release|arm64"> | ||
| <Configuration>Release</Configuration> | ||
| <Platform>arm64</Platform> | ||
| </ProjectConfiguration> | ||
| </ItemGroup> | ||
| <PropertyGroup> | ||
| <WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath> | ||
| <PathToXAMLWinRTImplementations>HelloUnoWorld.Windows.Desktop\</PathToXAMLWinRTImplementations> | ||
| <WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath> | ||
| <PathToXAMLWinRTImplementations>HelloUnoWorld.Windows.Desktop\</PathToXAMLWinRTImplementations> | ||
| </PropertyGroup> | ||
| <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" /> | ||
| <PropertyGroup> | ||
| <ProjectGuid>19a48274-d9e3-4855-8900-c9c32198b509</ProjectGuid> | ||
| <TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion> | ||
| <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion> | ||
| <DefaultLanguage>en-US</DefaultLanguage> | ||
| <AppxPackageSigningEnabled>false</AppxPackageSigningEnabled> | ||
| <AppxTargetsLocation Condition="'$(AppxTargetsLocation)'==''">$(MSBuildThisFileDirectory)build\</AppxTargetsLocation> | ||
| <ProjectGuid>19a48274-d9e3-4855-8900-c9c32198b509</ProjectGuid> | ||
| <TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion> | ||
| <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion> | ||
| <AssetTargetFallback>net5.0-windows$(TargetPlatformVersion);$(AssetTargetFallback)</AssetTargetFallback> | ||
| <DefaultLanguage>en-US</DefaultLanguage> | ||
| <AppxPackageSigningEnabled>false</AppxPackageSigningEnabled> | ||
| <EntryPointProjectUniqueName>..\HelloUnoWorld.Windows.Desktop\HelloUnoWorld.Windows.Desktop.csproj</EntryPointProjectUniqueName> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <AppxManifest Include="Package.appxmanifest"> | ||
| <SubType>Designer</SubType> | ||
| </AppxManifest> | ||
| <AppxManifest Include="Package.appxmanifest"> | ||
| <SubType>Designer</SubType> | ||
| </AppxManifest> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <Content Include="Images\SplashScreen.scale-200.png" /> | ||
| <Content Include="Images\LockScreenLogo.scale-200.png" /> | ||
| <Content Include="Images\Square150x150Logo.scale-200.png" /> | ||
| <Content Include="Images\Square44x44Logo.scale-200.png" /> | ||
| <Content Include="Images\Square44x44Logo.targetsize-24_altform-unplated.png" /> | ||
| <Content Include="Images\StoreLogo.png" /> | ||
| <Content Include="Images\Wide310x150Logo.scale-200.png" /> | ||
| <Content Include="Images\SplashScreen.scale-200.png" /> | ||
| <Content Include="Images\LockScreenLogo.scale-200.png" /> | ||
| <Content Include="Images\Square150x150Logo.scale-200.png" /> | ||
| <Content Include="Images\Square44x44Logo.scale-200.png" /> | ||
| <Content Include="Images\Square44x44Logo.targetsize-24_altform-unplated.png" /> | ||
| <Content Include="Images\StoreLogo.png" /> | ||
| <Content Include="Images\Wide310x150Logo.scale-200.png" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <ProjectReference Include="..\HelloUnoWorld.Windows.Desktop\HelloUnoWorld.Windows.Desktop.csproj"> | ||
| <SkipGetTargetFrameworkProperties>True</SkipGetTargetFrameworkProperties> | ||
| <PublishProfile>Properties\PublishProfiles\win10-$(Platform).pubxml</PublishProfile> | ||
| </ProjectReference> | ||
| <ProjectReference Include="..\HelloUnoWorld.Windows.Desktop\HelloUnoWorld.Windows.Desktop.csproj"> | ||
| <SkipGetTargetFrameworkProperties>True</SkipGetTargetFrameworkProperties> | ||
| <PublishProfile>Properties\PublishProfiles\win10-$(Platform).pubxml</PublishProfile> | ||
| </ProjectReference> | ||
| </ItemGroup> | ||
| <PropertyGroup> | ||
| <!--PackageReference.GeneratePathProperty does not support NUGET_PACKAGES env var...--> | ||
| <NuGetPackageRoot Condition="'$(NuGetPackageRoot)'==''">$(NUGET_PACKAGES)</NuGetPackageRoot> | ||
| <NuGetPackageRoot Condition="'$(NuGetPackageRoot)'==''">$(UserProfile)\.nuget\packages</NuGetPackageRoot> | ||
| <PkgMicrosoft_ProjectReunion Condition="'$(PkgMicrosoft_ProjectReunion)'==''">$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'Microsoft.ProjectReunion', '0.5.0'))</PkgMicrosoft_ProjectReunion> | ||
| <PkgMicrosoft_ProjectReunion Condition="!Exists($(PkgMicrosoft_ProjectReunion))">$(SolutionDir)packages\Microsoft.ProjectReunion.0.5.0-prerelease\</PkgMicrosoft_ProjectReunion> | ||
| <PkgMicrosoft_ProjectReunion_WinUI Condition="'$(PkgMicrosoft_ProjectReunion_WinUI)'==''">$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'Microsoft.ProjectReunion.WinUI', '0.5.0'))</PkgMicrosoft_ProjectReunion_WinUI> | ||
| <PkgMicrosoft_ProjectReunion_WinUI Condition="!Exists($(PkgMicrosoft_ProjectReunion_WinUI))">$(SolutionDir)packages\Microsoft.ProjectReunion.WinUI.0.5.0\</PkgMicrosoft_ProjectReunion_WinUI> | ||
| <Microsoft_ProjectReunion_AppXReference_props>$([MSBuild]::NormalizeDirectory('$(PkgMicrosoft_ProjectReunion)', 'build'))Microsoft.ProjectReunion.AppXReference.props</Microsoft_ProjectReunion_AppXReference_props> | ||
| <Microsoft_WinUI_AppX_targets>$([MSBuild]::NormalizeDirectory('$(PkgMicrosoft_ProjectReunion_WinUI)', 'build'))Microsoft.WinUI.AppX.targets</Microsoft_WinUI_AppX_targets> | ||
| <EntryPointProjectUniqueName>..\HelloUnoWorld.Windows.Desktop\HelloUnoWorld.Windows.Desktop.csproj</EntryPointProjectUniqueName> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <PackageReference Include="Microsoft.ProjectReunion" | ||
| GeneratePathProperty="true"> | ||
| <ExcludeAssets>all</ExcludeAssets> | ||
| </PackageReference> | ||
| <PackageReference Include="Microsoft.ProjectReunion.WinUI" | ||
| GeneratePathProperty="true"> | ||
| <ExcludeAssets>all</ExcludeAssets> | ||
| </PackageReference> | ||
| <PackageReference Include="Microsoft.WindowsAppSDK"> | ||
| <IncludeAssets>build</IncludeAssets> | ||
| </PackageReference> | ||
| <PackageReference Include="Microsoft.Windows.SDK.BuildTools"> | ||
| <IncludeAssets>build</IncludeAssets> | ||
| </PackageReference> | ||
| </ItemGroup> | ||
| <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" /> | ||
| <Import Project="$(Microsoft_ProjectReunion_AppXReference_props)" /> | ||
| <Import Project="$(Microsoft_WinUI_AppX_targets)" /> | ||
| </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