Move duplicate WinAppSdk proj file contents into single props file

This commit is contained in:
Matt Lacey 2022-04-12 23:19:00 +01:00
Родитель e4bc30cc43
Коммит 05f3c43754
5 изменённых файлов: 20 добавлений и 59 удалений

Просмотреть файл

@ -14,4 +14,11 @@
<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
<DefineConstants>WINAPPSDK</DefineConstants>
</PropertyGroup>
</Project>
<ItemGroup>
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.1" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22000.194" />
<Manifest Include="$(ApplicationManifest)" />
</ItemGroup>
</Project>

Просмотреть файл

@ -1,16 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
<RootNamespace>CanvasLayout.UnitTests.WinAppSdk</RootNamespace>
<ApplicationManifest>app.manifest</ApplicationManifest>
<Platforms>x86;x64;arm64</Platforms>
<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
<PublishProfile>win10-$(Platform).pubxml</PublishProfile>
<UseWinUI>true</UseWinUI>
<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
</PropertyGroup>
<Import Project="$(RepositoryDirectory)common\Labs.WinAppSdk.props" />
<ItemGroup>
<Content Include="..\..\..\..\common\CommunityToolkit.Labs.Shared\Assets\LockScreenLogo.scale-200.png" Link="Assets\LockScreenLogo.scale-200.png" />
<Content Include="..\..\..\..\common\CommunityToolkit.Labs.Shared\Assets\Square150x150Logo.scale-200.png" Link="Assets\Square150x150Logo.scale-200.png" />
@ -19,12 +10,6 @@
<Content Include="..\..\..\..\common\CommunityToolkit.Labs.Shared\Assets\StoreLogo.png" Link="Assets\StoreLogo.png" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.1" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22000.194" />
<Manifest Include="$(ApplicationManifest)" />
</ItemGroup>
<!-- Defining the "Msix" ProjectCapability here allows the Single-project MSIX Packaging
Tools extension to be activated for this project even if the Windows App SDK Nuget
package has not yet been restored -->
@ -32,15 +17,7 @@
<ProjectCapability Include="Msix" />
</ItemGroup>
<ItemGroup>
<ProjectCapability Include="TestContainer" />
</ItemGroup>
<Import Project="$(RepositoryDirectory)tests\Labs.Tests.WinAppSdk.props" />
<ItemGroup>
<Folder Include="Assets\" />
</ItemGroup>
<Import Project="..\CanvasLayout.Tests\CanvasLayout.Tests.projitems" Label="Shared" />
</Project>

Просмотреть файл

@ -9,12 +9,6 @@
<ApplicationManifest>app.manifest</ApplicationManifest>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22000.194" />
<Manifest Include="$(ApplicationManifest)" />
</ItemGroup>
<!-- Defining the "Msix" ProjectCapability here allows the Single-project MSIX Packaging
Tools extension to be activated for this project even if the Windows App SDK Nuget
package has not yet been restored -->

Просмотреть файл

@ -1,16 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
<RootNamespace>CommunityToolkit.Labs.UnitTests.WinAppSdk</RootNamespace>
<ApplicationManifest>app.manifest</ApplicationManifest>
<Platforms>x86;x64;arm64</Platforms>
<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
<PublishProfile>win10-$(Platform).pubxml</PublishProfile>
<UseWinUI>true</UseWinUI>
<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
</PropertyGroup>
<Import Project="$(RepositoryDirectory)common\Labs.WinAppSdk.props" />
<ItemGroup>
<Content Include="..\..\common\CommunityToolkit.Labs.Shared\Assets\LockScreenLogo.scale-200.png" Link="Assets\LockScreenLogo.scale-200.png" />
<Content Include="..\..\common\CommunityToolkit.Labs.Shared\Assets\SplashScreen.scale-200.png" Link="Assets\SplashScreen.scale-200.png" />
@ -21,12 +12,6 @@
<Content Include="..\..\common\CommunityToolkit.Labs.Shared\Assets\Wide310x150Logo.scale-200.png" Link="Assets\Wide310x150Logo.scale-200.png" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.1" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22000.194" />
<Manifest Include="$(ApplicationManifest)" />
</ItemGroup>
<!-- Defining the "Msix" ProjectCapability here allows the Single-project MSIX Packaging
Tools extension to be activated for this project even if the Windows App SDK Nuget
package has not yet been restored -->
@ -34,16 +19,8 @@
<ProjectCapability Include="Msix" />
</ItemGroup>
<ItemGroup>
<ProjectCapability Include="TestContainer" />
</ItemGroup>
<Import Project="$(RepositoryDirectory)tests\Labs.Tests.WinAppSdk.props" />
<ItemGroup>
<Folder Include="Assets\" />
</ItemGroup>
<!-- Visual Studio likes to delete the following line - but it's needed to find the tests -->
<Import Project="..\..\labs\**\*.Tests.projitems" Label="Shared" />
</Project>

Просмотреть файл

@ -1,10 +1,16 @@
<Project>
<Import Project="$(RepositoryDirectory)tests\Labs.Tests.props" />
<ItemGroup>
<PackageReference Include="Microsoft.TestPlatform.TestHost">
<Version>17.1.0</Version>
<ExcludeAssets>build</ExcludeAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>
<ProjectCapability Include="TestContainer" />
</ItemGroup>
</Project>