diff --git a/CommunityToolkit.WinUI.SampleApp/CommunityToolkit.WinUI.SampleApp.csproj b/CommunityToolkit.WinUI.SampleApp/CommunityToolkit.WinUI.SampleApp.csproj
index 3996cad1e23..515f611ba6a 100644
--- a/CommunityToolkit.WinUI.SampleApp/CommunityToolkit.WinUI.SampleApp.csproj
+++ b/CommunityToolkit.WinUI.SampleApp/CommunityToolkit.WinUI.SampleApp.csproj
@@ -27,7 +27,7 @@
10.1901.28001
-->
- 7.1.2
+ 8.0.0
diff --git a/UITests/UITests.Tests.Shared/UITestBase.cs b/UITests/UITests.Tests.Shared/UITestBase.cs
index e3a38a0ca8a..e1661770676 100644
--- a/UITests/UITests.Tests.Shared/UITestBase.cs
+++ b/UITests/UITests.Tests.Shared/UITestBase.cs
@@ -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" };
@@ -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,
diff --git a/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj b/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj
index ee83d72ac30..039a958955e 100644
--- a/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj
+++ b/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj
@@ -66,7 +66,7 @@
-
+
diff --git a/UnitTests/UnitTests.HighPerformance.WinUI/App.xaml b/UnitTests/UnitTests.HighPerformance.WinUI/App.xaml
deleted file mode 100644
index 9c85e2c1a39..00000000000
--- a/UnitTests/UnitTests.HighPerformance.WinUI/App.xaml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/UnitTests/UnitTests.HighPerformance.WinUI/App.xaml.cs b/UnitTests/UnitTests.HighPerformance.WinUI/App.xaml.cs
deleted file mode 100644
index 2238b5b73eb..00000000000
--- a/UnitTests/UnitTests.HighPerformance.WinUI/App.xaml.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using Microsoft.UI.Xaml;
-using Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer;
-
-namespace UnitTests.HighPerformance.WinUI
-{
- ///
- /// Provides application-specific behavior to supplement the default Application class.
- ///
- public sealed partial class App : Application
- {
- private static MainWindow _window;
-
- public App()
- {
- InitializeComponent();
- }
-
- ///
- protected override void OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventArgs e)
- {
-#if DEBUG
- if (System.Diagnostics.Debugger.IsAttached)
- {
- DebugSettings.EnableFrameRateCounter = true;
- }
-#endif
-
- Microsoft.VisualStudio.TestPlatform.TestExecutor.UnitTestClient.CreateDefaultUI();
-
- _window = new MainWindow();
-
- // Ensure the current window is active
- _window.Activate();
-
- UITestMethodAttribute.DispatcherQueue = _window.DispatcherQueue;
-
- // replace back with e.Arguments when https://github.com/microsoft/microsoft-ui-xaml/issues/3368 is fixed
- Microsoft.VisualStudio.TestPlatform.TestExecutor.UnitTestClient.Run(Environment.CommandLine);
- }
- }
-}
\ No newline at end of file
diff --git a/UnitTests/UnitTests.HighPerformance.WinUI/Assets/LockScreenLogo.scale-200.png b/UnitTests/UnitTests.HighPerformance.WinUI/Assets/LockScreenLogo.scale-200.png
deleted file mode 100644
index 735f57adb5d..00000000000
Binary files a/UnitTests/UnitTests.HighPerformance.WinUI/Assets/LockScreenLogo.scale-200.png and /dev/null differ
diff --git a/UnitTests/UnitTests.HighPerformance.WinUI/Assets/SplashScreen.scale-200.png b/UnitTests/UnitTests.HighPerformance.WinUI/Assets/SplashScreen.scale-200.png
deleted file mode 100644
index 023e7f1feda..00000000000
Binary files a/UnitTests/UnitTests.HighPerformance.WinUI/Assets/SplashScreen.scale-200.png and /dev/null differ
diff --git a/UnitTests/UnitTests.HighPerformance.WinUI/Assets/Square150x150Logo.scale-200.png b/UnitTests/UnitTests.HighPerformance.WinUI/Assets/Square150x150Logo.scale-200.png
deleted file mode 100644
index af49fec1a54..00000000000
Binary files a/UnitTests/UnitTests.HighPerformance.WinUI/Assets/Square150x150Logo.scale-200.png and /dev/null differ
diff --git a/UnitTests/UnitTests.HighPerformance.WinUI/Assets/Square44x44Logo.scale-200.png b/UnitTests/UnitTests.HighPerformance.WinUI/Assets/Square44x44Logo.scale-200.png
deleted file mode 100644
index ce342a2ec8a..00000000000
Binary files a/UnitTests/UnitTests.HighPerformance.WinUI/Assets/Square44x44Logo.scale-200.png and /dev/null differ
diff --git a/UnitTests/UnitTests.HighPerformance.WinUI/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/UnitTests/UnitTests.HighPerformance.WinUI/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
deleted file mode 100644
index f6c02ce97e0..00000000000
Binary files a/UnitTests/UnitTests.HighPerformance.WinUI/Assets/Square44x44Logo.targetsize-24_altform-unplated.png and /dev/null differ
diff --git a/UnitTests/UnitTests.HighPerformance.WinUI/Assets/StoreLogo.png b/UnitTests/UnitTests.HighPerformance.WinUI/Assets/StoreLogo.png
deleted file mode 100644
index 7385b56c0e4..00000000000
Binary files a/UnitTests/UnitTests.HighPerformance.WinUI/Assets/StoreLogo.png and /dev/null differ
diff --git a/UnitTests/UnitTests.HighPerformance.WinUI/Assets/Wide310x150Logo.scale-200.png b/UnitTests/UnitTests.HighPerformance.WinUI/Assets/Wide310x150Logo.scale-200.png
deleted file mode 100644
index 288995b397f..00000000000
Binary files a/UnitTests/UnitTests.HighPerformance.WinUI/Assets/Wide310x150Logo.scale-200.png and /dev/null differ
diff --git a/UnitTests/UnitTests.HighPerformance.WinUI/MainWindow.xaml b/UnitTests/UnitTests.HighPerformance.WinUI/MainWindow.xaml
deleted file mode 100644
index d1a8526e144..00000000000
--- a/UnitTests/UnitTests.HighPerformance.WinUI/MainWindow.xaml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/UnitTests/UnitTests.HighPerformance.WinUI/MainWindow.xaml.cs b/UnitTests/UnitTests.HighPerformance.WinUI/MainWindow.xaml.cs
deleted file mode 100644
index fa517951c9d..00000000000
--- a/UnitTests/UnitTests.HighPerformance.WinUI/MainWindow.xaml.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace UnitTests.HighPerformance.WinUI
-{
- public sealed partial class MainWindow
- {
- public MainWindow()
- {
- InitializeComponent();
- }
- }
-}
diff --git a/UnitTests/UnitTests.HighPerformance.WinUI/Properties/AssemblyInfo.cs b/UnitTests/UnitTests.HighPerformance.WinUI/Properties/AssemblyInfo.cs
deleted file mode 100644
index 8376008ad69..00000000000
--- a/UnitTests/UnitTests.HighPerformance.WinUI/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: AssemblyMetadata("TargetPlatform", "UAP")]
-
-[assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/UnitTests/UnitTests.HighPerformance.WinUI/UnitTests.HighPerformance.WinUI.csproj b/UnitTests/UnitTests.HighPerformance.WinUI/UnitTests.HighPerformance.WinUI.csproj
deleted file mode 100644
index 35ec52f6262..00000000000
--- a/UnitTests/UnitTests.HighPerformance.WinUI/UnitTests.HighPerformance.WinUI.csproj
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
-
- WinExe
- net5.0-windows10.0.19041.0
- 10.0.17763.0
-
- UnitTests.HighPerformance.WinUI
-
- x86;x64;arm64
- win10-x86;win10-x64;win10-arm64
- true
-
- false
-
- app.manifest
-
- true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Designer
-
-
-
-
-
-
-
-
-
-
-
-
-
- 2.2.6-preview-20211011-01
-
-
- 2.2.6-preview-20211011-01
-
-
- 17.1.0-preview-20211109-03
- build
-
-
- 10.0.3
-
-
-
-
-
-
-
-
- MSBuild:Compile
-
-
-
-
-
-
\ No newline at end of file
diff --git a/UnitTests/UnitTests.HighPerformance.WinUI/app.manifest b/UnitTests/UnitTests.HighPerformance.WinUI/app.manifest
deleted file mode 100644
index b3c4d650166..00000000000
--- a/UnitTests/UnitTests.HighPerformance.WinUI/app.manifest
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
- true/PM
- PerMonitorV2, PerMonitor
-
-
-
diff --git a/UnitTests/UnitTests.WinUI/UnitTests.WinUI.csproj b/UnitTests/UnitTests.WinUI/UnitTests.WinUI.csproj
index 6d4e87acddc..ac6215d788c 100644
--- a/UnitTests/UnitTests.WinUI/UnitTests.WinUI.csproj
+++ b/UnitTests/UnitTests.WinUI/UnitTests.WinUI.csproj
@@ -2,7 +2,7 @@
WinExe
- net5.0-windows10.0.19041.0
+ net6.0-windows10.0.19041.0
10.0.17763.0
UnitTests.WinUI
@@ -30,17 +30,11 @@
- 5.0.1
+ 6.0.0
5.10.3
-
- 7.1.2
-
-
- 7.1.2
-
2.2.6-preview-20211011-01
@@ -62,7 +56,7 @@
- 1.0.0.30
+ 1.0.3.1
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 9020151b7db..ed8c62c3aa4 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -2,11 +2,13 @@ trigger:
- main
- dev/*
- rel/*
+- winui
pr:
- main
- dev/*
- rel/*
+- winui
pool:
vmImage: windows-2022
@@ -38,9 +40,9 @@ jobs:
forceReinstallCredentialProvider: true
- task: UseDotNet@2
- displayName: 'Install .NET Core SDK'
+ displayName: 'Install .NET SDK'
inputs:
- version: 5.0.403
+ version: 6.0.400
performMultiLevelLookup: true
- task: DotNetCoreCLI@2
diff --git a/build/Windows.Toolkit.Common.props b/build/Windows.Toolkit.Common.props
index a100c4d3343..59df0ebcc16 100644
--- a/build/Windows.Toolkit.Common.props
+++ b/build/Windows.Toolkit.Common.props
@@ -26,7 +26,7 @@
10.0
18362
17763
- 1.0.0
+ 1.0.4
1.3.5
diff --git a/global.json b/global.json
index 61f63b50b91..fd460adde35 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
{
"sdk": {
- "version": "5.0.403"
+ "version": "6.0.400"
},
"msbuild-sdks": {
"MSBuild.Sdk.Extras": "3.0.38"
diff --git a/version.json b/version.json
index d78588dbfd5..3424fdadf6f 100644
--- a/version.json
+++ b/version.json
@@ -1,5 +1,5 @@
{
- "version": "7.1.0-build.{height}",
+ "version": "7.1.3-build.{height}",
"publicReleaseRefSpec": [
"^refs/heads/main$", // we release out of main
"^refs/heads/dev$", // we release out of dev