Skip to content
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.

Sign up for GitHub

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

Jump to bottom

🚧 Update/Test building of WinUI branch #4751

Closed
wants to merge 2 commits into from
Closed

🚧 Update/Test building of WinUI branch #4751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f305712
Remove missed test project from .NCT migration
michael-hawker Aug 25, 2022
5ea5359
Update pipeline to use .NET 6 and build locally on command line
michael-hawker Sep 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CommunityToolkit.WinUI.SampleApp/CommunityToolkit.WinUI.SampleApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<Version>10.1901.28001</Version>
</PackageReference>-->
<PackageReference Include="CommunityToolkit.Common">
<Version>7.1.2</Version>
<Version>8.0.0</Version>
</PackageReference>
<!-- TODO Reintroduce graph controls
<PackageReference Include="CommunityToolkit.Common.Graph.Controls">
Expand Down
2 changes: 1 addition & 1 deletion CommunityToolkit.WinUI.SampleApp/Properties/PublishProfiles/win10-arm64.pubxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
<SelfContained>true</SelfContained>
<PublishSingleFile>False</PublishSingleFile>
<PublishReadyToRun>True</PublishReadyToRun>
<PublishReadyToRun>False</PublishReadyToRun>
<PublishTrimmed>True</PublishTrimmed>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion CommunityToolkit.WinUI.SampleApp/Properties/PublishProfiles/win10-x64.pubxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
<SelfContained>true</SelfContained>
<PublishSingleFile>False</PublishSingleFile>
<PublishReadyToRun>True</PublishReadyToRun>
<PublishReadyToRun>False</PublishReadyToRun>
<PublishTrimmed>True</PublishTrimmed>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion CommunityToolkit.WinUI.SampleApp/Properties/PublishProfiles/win10-x86.pubxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
<SelfContained>true</SelfContained>
<PublishSingleFile>False</PublishSingleFile>
<PublishReadyToRun>True</PublishReadyToRun>
<PublishReadyToRun>False</PublishReadyToRun>
<PublishTrimmed>True</PublishTrimmed>
</PropertyGroup>
</Project>
4 changes: 2 additions & 2 deletions CommunityToolkit.WinUI.UI.Controls.Media/CommunityToolkit.WinUI.UI.Controls.Media.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="System.Text.Json" Version="5.0.2" />
<PackageReference Include="Microsoft.Graphics.Win2D" Version="1.0.0.30" />
<PackageReference Include="System.Text.Json" Version="6.0.5" />
<PackageReference Include="Microsoft.Graphics.Win2D" Version="1.0.3.1" />
</ItemGroup>

<Import Project="$(BuildToolsDirectory)Windows.Toolkit.WinUI.Controls.targets" />
Expand Down
2 changes: 1 addition & 1 deletion CommunityToolkit.WinUI.UI.Media/CommunityToolkit.WinUI.UI.Media.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@

<ItemGroup>
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
<PackageReference Include="Microsoft.Graphics.Win2D" Version="1.0.0.30" />
<PackageReference Include="Microsoft.Graphics.Win2D" Version="1.0.3.1" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion CommunityToolkit.WinUI.UI/CommunityToolkit.WinUI.UI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="CommunityToolkit.Common" Version="7.1.2" />
<PackageReference Include="CommunityToolkit.Common" Version="8.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion CommunityToolkit.WinUI/CommunityToolkit.WinUI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="CommunityToolkit.Common" Version="7.1.2" />
<PackageReference Include="CommunityToolkit.Common" Version="8.0.0" />
</ItemGroup>

</Project>
1 change: 1 addition & 0 deletions CommunityToolkit.WinUI/Helpers/ObjectStorage/ApplicationDataStorageHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
using System.Linq;
using System.Threading.Tasks;
using CommunityToolkit.Common.Helpers;
using CommunityToolkit.Helpers; //// TODO: See https://github.com/CommunityToolkit/dotnet/issues/403
using Windows.Storage;
using Windows.System;

Expand Down
4 changes: 2 additions & 2 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
<Import Project="$(BuildToolsDirectory)Windows.Toolkit.VisualStudio.Design.props" Condition="$(IsDesignProject)" />

<ItemGroup>
<PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
<PackageReference Include="Nerdbank.GitVersioning" Version="3.5.109" PrivateAssets="All" />
</ItemGroup>

<Choose>
Expand All @@ -78,7 +78,7 @@
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
</ItemGroup>
</When>
</Choose>
Expand Down
2 changes: 1 addition & 1 deletion GazeInputTest/Properties/PublishProfiles/win10-arm64.pubxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
<SelfContained>true</SelfContained>
<PublishSingleFile>False</PublishSingleFile>
<PublishReadyToRun>True</PublishReadyToRun>
<PublishReadyToRun>False</PublishReadyToRun>
<!--
See https://github.com/microsoft/CsWinRT/issues/373
<PublishTrimmed>True</PublishTrimmed>
Expand Down
2 changes: 1 addition & 1 deletion GazeInputTest/Properties/PublishProfiles/win10-x64.pubxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
<SelfContained>true</SelfContained>
<PublishSingleFile>False</PublishSingleFile>
<PublishReadyToRun>True</PublishReadyToRun>
<PublishReadyToRun>False</PublishReadyToRun>
<!--
See https://github.com/microsoft/CsWinRT/issues/373
<PublishTrimmed>True</PublishTrimmed>
Expand Down
2 changes: 1 addition & 1 deletion GazeInputTest/Properties/PublishProfiles/win10-x86.pubxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
<SelfContained>true</SelfContained>
<PublishSingleFile>False</PublishSingleFile>
<PublishReadyToRun>True</PublishReadyToRun>
<PublishReadyToRun>False</PublishReadyToRun>
<!--
See https://github.com/microsoft/CsWinRT/issues/373
<PublishTrimmed>True</PublishTrimmed>
Expand Down
6 changes: 3 additions & 3 deletions UITests/UITests.App.Package/Package.appxmanifest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Package
<Package
xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
Expand All @@ -7,14 +7,14 @@

<Identity
Name="3568ebdf-5b6b-4ddd-bb17-462d614ba50f"
Publisher="CN=alzollin"
Publisher="CN=toolkit"
Version="1.0.0.0" />

<mp:PhoneIdentity PhoneProductId="3568ebdf-5b6b-4ddd-bb17-462d614ba50f" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>

<Properties>
<DisplayName>UITests.App</DisplayName>
<PublisherDisplayName>alzollin</PublisherDisplayName>
<PublisherDisplayName>toolkit</PublisherDisplayName>
<Logo>Assets\StoreLogo.png</Logo>
</Properties>

Expand Down
3 changes: 2 additions & 1 deletion UITests/UITests.App.Package/UITests.App.Package.wapproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
<AssetTargetFallback>net5.0-windows$(TargetPlatformVersion);$(AssetTargetFallback)</AssetTargetFallback>
<DefaultLanguage>en-US</DefaultLanguage>
<AppxPackageSigningEnabled>true</AppxPackageSigningEnabled>
<AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
<EntryPointProjectUniqueName>..\UITests.App\UITests.App.csproj</EntryPointProjectUniqueName>
<EntryPointExe>UITests.App.exe</EntryPointExe>
<AppxPackageName>UITests.App</AppxPackageName>
Expand Down Expand Up @@ -81,6 +81,7 @@
<AppxPlatform Condition="'$(Platform)' == '' or '$(Platform)' == 'AnyCPU'">$(arch)</AppxPlatform>
<AppxPlatform Condition="'$(Platform)' == 'Win32'">x86</AppxPlatform>
<AppxPlatform Condition="'$(AppxPlatform)' == ''">$(Platform)</AppxPlatform>
<PackageCertificateThumbprint>E6D06D70A0FB8B69843E534CC07B74B92DDEC58C</PackageCertificateThumbprint>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.WindowsAppSDK" Version="[$(WindowsAppSDKVersion)]">
Expand Down
Binary file modified UITests/UITests.App.Package/UITests.App.pfx
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion UITests/UITests.App/Properties/PublishProfiles/win10-arm64.pubxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<RuntimeIdentifier>win10-arm64</RuntimeIdentifier>
<SelfContained>true</SelfContained>
<PublishSingleFile>False</PublishSingleFile>
<PublishReadyToRun>True</PublishReadyToRun>
<PublishReadyToRun>False</PublishReadyToRun>
<!--
See https://github.com/microsoft/CsWinRT/issues/373
<PublishTrimmed>True</PublishTrimmed>
Expand Down
2 changes: 1 addition & 1 deletion UITests/UITests.App/Properties/PublishProfiles/win10-x64.pubxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<RuntimeIdentifier>win10-x64</RuntimeIdentifier>
<SelfContained>true</SelfContained>
<PublishSingleFile>False</PublishSingleFile>
<PublishReadyToRun>True</PublishReadyToRun>
<PublishReadyToRun>False</PublishReadyToRun>
<!--
See https://github.com/microsoft/CsWinRT/issues/373
<PublishTrimmed>True</PublishTrimmed>
Expand Down
2 changes: 1 addition & 1 deletion UITests/UITests.App/Properties/PublishProfiles/win10-x86.pubxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<RuntimeIdentifier>win10-x86</RuntimeIdentifier>
<SelfContained>true</SelfContained>
<PublishSingleFile>False</PublishSingleFile>
<PublishReadyToRun>True</PublishReadyToRun>
<PublishReadyToRun>False</PublishReadyToRun>
<!--
See https://github.com/microsoft/CsWinRT/issues/373
<PublishTrimmed>True</PublishTrimmed>
Expand Down
12 changes: 3 additions & 9 deletions UITests/UITests.App/UITests.App.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net5.0-windows10.0.19041.0</TargetFramework>
<TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>

<RootNamespace>UITests.App</RootNamespace>
Expand Down Expand Up @@ -38,22 +38,16 @@
<Version>3.0.0-zmain.210930.1</Version>
<ExcludeAssets>runtime</ExcludeAssets>
</PackageReference>
<PackageReference Include="CommunityToolkit.Common">
<Version>7.1.2</Version>
</PackageReference>
<PackageReference Include="CommunityToolkit.Diagnostics">
<Version>7.1.2</Version>
</PackageReference>
<PackageReference Include="CommunityToolkit.Mvvm">
<Version>7.1.2</Version>
<Version>8.0.0</Version>
</PackageReference>
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="$(MicrosoftCsWinRTVersion)" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" />
<PackageReference Include="Grpc" Version="2.38.1" />
<PackageReference Include="Google.Protobuf" Version="3.17.3" />
<PackageReference Include="Grpc.Tools" Version="2.38.1" PrivateAssets="All" />
<PackageReference Include="Grpc.AspNetCore" Version="2.38.0" />
<PackageReference Include="System.Text.Json" Version="5.0.2" />
<PackageReference Include="System.Text.Json" Version="6.0.5" />
</ItemGroup>
<ItemGroup>
<Content Include="$(PkgMicrosoft_Internal_MUXAppTestHelpers_WinUI)\content\AppTestAutomationHelpers\TestAutomationHelpersPanel.xaml">
Expand Down
2 changes: 1 addition & 1 deletion UITests/UITests.Tests.MSTest/UITests.Tests.MSTest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="CommunityToolkit.Common" Version="7.1.2" />
<PackageReference Include="CommunityToolkit.Common" Version="8.0.0" />
<!-- MSTest -->
<PackageReference Include="MSTest.TestAdapter" Version="2.2.6-preview-20211011-01" />
<PackageReference Include="MSTest.TestFramework" Version="2.2.6-preview-20211011-01" />
Expand Down
6 changes: 3 additions & 3 deletions UITests/UITests.Tests.Shared/UITestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ internal static TestApplicationInfo UITestsAppSampleApp
Log.Comment($"Base Package Search Directory = \"{baseDirectory}\"");

#if USING_TAEF
string testAppName = "3568ebdf-5b6b-4ddd-bb17-462d614ba50f_gspb8g6x97k2t!App";
string testAppName = "3568ebdf-5b6b-4ddd-bb17-462d614ba50f_yeyc6z1eztrme!App";
string installerName = "UITests.App";
#else
var exclude = new[] { "Microsoft.WindowsAppRuntime", "Microsoft.VCLibs" };
Expand All @@ -65,14 +65,14 @@ internal static TestApplicationInfo UITestsAppSampleApp
}
}

string testAppName = "3568ebdf-5b6b-4ddd-bb17-462d614ba50f_gspb8g6x97k2t!App";
string testAppName = "3568ebdf-5b6b-4ddd-bb17-462d614ba50f_yeyc6z1eztrme!App";
string installerName = mostRecentlyBuiltPackage.Replace(".msix", string.Empty);
#endif

return new TestApplicationInfo(
testAppPackageName: "UITests.App",
testAppName: testAppName,
testAppPackageFamilyName: "3568ebdf-5b6b-4ddd-bb17-462d614ba50f_gspb8g6x97k2t",
testAppPackageFamilyName: "3568ebdf-5b6b-4ddd-bb17-462d614ba50f_yeyc6z1eztrme",
testAppMainWindowTitle: "UITests.App",
processName: "UITests.App.exe",
installerName: installerName,
Expand Down
2 changes: 1 addition & 1 deletion UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@

<ItemGroup>
<!-- System packages -->
<PackageReference Include="System.Text.Json" Version="5.0.2" />
<PackageReference Include="System.Text.Json" Version="6.0.5" />
<!-- Microsoft.UI.Xaml TAEF Extensions -->
<PackageReference Include="Microsoft.Internal.MUXTestInfra.TAEF" Version="3.0.0-zmain.210930.1" />
<PackageReference Include="MUXCustomBuildTasks" Version="1.0.67" GeneratePathProperty="true" />
Expand Down
12 changes: 0 additions & 12 deletions UnitTests/UnitTests.HighPerformance.WinUI/App.xaml
View file
Open in desktop

This file was deleted.

46 changes: 0 additions & 46 deletions UnitTests/UnitTests.HighPerformance.WinUI/App.xaml.cs
View file
Open in desktop

This file was deleted.

Binary file removed UnitTests/UnitTests.HighPerformance.WinUI/Assets/LockScreenLogo.scale-200.png
View file
Open in desktop
Binary file not shown.
Binary file removed UnitTests/UnitTests.HighPerformance.WinUI/Assets/SplashScreen.scale-200.png
View file
Open in desktop
Binary file not shown.
Binary file removed UnitTests/UnitTests.HighPerformance.WinUI/Assets/Square150x150Logo.scale-200.png
View file
Open in desktop
Binary file not shown.
Binary file removed UnitTests/UnitTests.HighPerformance.WinUI/Assets/Square44x44Logo.scale-200.png
View file
Open in desktop
Binary file not shown.
Binary file removed ...HighPerformance.WinUI/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
View file
Open in desktop
Binary file not shown.
Binary file removed UnitTests/UnitTests.HighPerformance.WinUI/Assets/StoreLogo.png
View file
Open in desktop
Binary file not shown.
Binary file removed UnitTests/UnitTests.HighPerformance.WinUI/Assets/Wide310x150Logo.scale-200.png
View file
Open in desktop
Binary file not shown.
10 changes: 0 additions & 10 deletions UnitTests/UnitTests.HighPerformance.WinUI/MainWindow.xaml
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions UnitTests/UnitTests.HighPerformance.WinUI/MainWindow.xaml.cs
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions UnitTests/UnitTests.HighPerformance.WinUI/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

Loading