diff --git a/Samples/ItemsViewIntegrationApp/ItemsViewIntegrationApp/ItemsViewIntegrationApp.csproj b/Samples/ItemsViewIntegrationApp/ItemsViewIntegrationApp/ItemsViewIntegrationApp.csproj index 044b1abbf0..f831f5cb33 100644 --- a/Samples/ItemsViewIntegrationApp/ItemsViewIntegrationApp/ItemsViewIntegrationApp.csproj +++ b/Samples/ItemsViewIntegrationApp/ItemsViewIntegrationApp/ItemsViewIntegrationApp.csproj @@ -2,13 +2,14 @@ WinExe - $(WindowsAppSdkTargetFrameworkMoniker) + $(SamplesTargetFrameworkMoniker) $(WindowsAppSdkTargetPlatformVersion) ItemsViewIntegrationApp app.manifest x86;x64;ARM64 - win10-x86;win10-x64;win10-arm64 - win10-$(Platform).pubxml + win-x86;win-x64;win-arm64 + win10-x86;win10-x64;win10-arm64 + win-$(Platform).pubxml true true true diff --git a/Samples/ItemsViewIntegrationApp/ItemsViewIntegrationApp/Properties/PublishProfiles/win10-arm64.pubxml b/Samples/ItemsViewIntegrationApp/ItemsViewIntegrationApp/Properties/PublishProfiles/win-arm64.pubxml similarity index 72% rename from Samples/ItemsViewIntegrationApp/ItemsViewIntegrationApp/Properties/PublishProfiles/win10-arm64.pubxml rename to Samples/ItemsViewIntegrationApp/ItemsViewIntegrationApp/Properties/PublishProfiles/win-arm64.pubxml index 25349f2197..481c255c01 100644 --- a/Samples/ItemsViewIntegrationApp/ItemsViewIntegrationApp/Properties/PublishProfiles/win10-arm64.pubxml +++ b/Samples/ItemsViewIntegrationApp/ItemsViewIntegrationApp/Properties/PublishProfiles/win-arm64.pubxml @@ -1,4 +1,4 @@ - + @@ -6,7 +6,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121. FileSystem ARM64 - win10-arm64 + win-arm64 + win10-arm64 bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\ true False diff --git a/perf/scenarios/XAMLPerf.UnpackagedApp.Cs.MUX/Properties/PublishProfiles/win10-x64.pubxml b/Samples/ItemsViewIntegrationApp/ItemsViewIntegrationApp/Properties/PublishProfiles/win-x64.pubxml similarity index 72% rename from perf/scenarios/XAMLPerf.UnpackagedApp.Cs.MUX/Properties/PublishProfiles/win10-x64.pubxml rename to Samples/ItemsViewIntegrationApp/ItemsViewIntegrationApp/Properties/PublishProfiles/win-x64.pubxml index 4da0fea29b..bd658a4abf 100644 --- a/perf/scenarios/XAMLPerf.UnpackagedApp.Cs.MUX/Properties/PublishProfiles/win10-x64.pubxml +++ b/Samples/ItemsViewIntegrationApp/ItemsViewIntegrationApp/Properties/PublishProfiles/win-x64.pubxml @@ -1,4 +1,4 @@ - + @@ -6,7 +6,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121. FileSystem x64 - win10-x64 + win-x64 + win10-x64 bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\ true False diff --git a/perf/scenarios/XAMLPerf.UnpackagedApp.Cs.MUX/Properties/PublishProfiles/win10-x86.pubxml b/Samples/ItemsViewIntegrationApp/ItemsViewIntegrationApp/Properties/PublishProfiles/win-x86.pubxml similarity index 72% rename from perf/scenarios/XAMLPerf.UnpackagedApp.Cs.MUX/Properties/PublishProfiles/win10-x86.pubxml rename to Samples/ItemsViewIntegrationApp/ItemsViewIntegrationApp/Properties/PublishProfiles/win-x86.pubxml index c94522ca94..ec8f1e2def 100644 --- a/perf/scenarios/XAMLPerf.UnpackagedApp.Cs.MUX/Properties/PublishProfiles/win10-x86.pubxml +++ b/Samples/ItemsViewIntegrationApp/ItemsViewIntegrationApp/Properties/PublishProfiles/win-x86.pubxml @@ -1,4 +1,4 @@ - + @@ -6,7 +6,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121. FileSystem x86 - win10-x86 + win-x86 + win10-x86 bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\ true False diff --git a/controls/test/testinfra/MUXTestInfra/MUXTestInfra.csproj b/controls/test/testinfra/MUXTestInfra/MUXTestInfra.csproj index 42b69c9eb2..99175636fa 100644 --- a/controls/test/testinfra/MUXTestInfra/MUXTestInfra.csproj +++ b/controls/test/testinfra/MUXTestInfra/MUXTestInfra.csproj @@ -2,10 +2,11 @@ MUXTestInfra x86;x64;ARM64 - $(WindowsAppSdkTargetFrameworkMoniker) + $(DotNetCoreTargetFrameworkMoniker) $(WindowsAppSdkTargetPlatformVersion) $(TargetPlatformMinVersion) - win10-x86;win10-x64;win10-arm64 + win-x86;win-x64;win-arm64 + win10-x86;win10-x64;win10-arm64 $(DefineConstants);INNERLOOP_BUILD @@ -15,8 +16,9 @@ - - + + diff --git a/eng/adhocapp.props b/eng/adhocapp.props index ffb876c156..837171414a 100644 --- a/eng/adhocapp.props +++ b/eng/adhocapp.props @@ -25,7 +25,9 @@ - net6.0-windows$(WindowsTargetPlatformVersion);$(AssetTargetFallback) + + net6.0-windows$(WindowsTargetPlatformVersion);net8.0-windows$(WindowsTargetPlatformVersion);$(AssetTargetFallback) diff --git a/perf/scenarios/XAMLPerf.UnpackagedApp.Cs.MUX/Properties/PublishProfiles/win10-arm64.pubxml b/perf/scenarios/XAMLPerf.UnpackagedApp.Cs.MUX/Properties/PublishProfiles/win-arm64.pubxml similarity index 72% rename from perf/scenarios/XAMLPerf.UnpackagedApp.Cs.MUX/Properties/PublishProfiles/win10-arm64.pubxml rename to perf/scenarios/XAMLPerf.UnpackagedApp.Cs.MUX/Properties/PublishProfiles/win-arm64.pubxml index 25349f2197..481c255c01 100644 --- a/perf/scenarios/XAMLPerf.UnpackagedApp.Cs.MUX/Properties/PublishProfiles/win10-arm64.pubxml +++ b/perf/scenarios/XAMLPerf.UnpackagedApp.Cs.MUX/Properties/PublishProfiles/win-arm64.pubxml @@ -1,4 +1,4 @@ - + @@ -6,7 +6,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121. FileSystem ARM64 - win10-arm64 + win-arm64 + win10-arm64 bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\ true False diff --git a/Samples/ItemsViewIntegrationApp/ItemsViewIntegrationApp/Properties/PublishProfiles/win10-x64.pubxml b/perf/scenarios/XAMLPerf.UnpackagedApp.Cs.MUX/Properties/PublishProfiles/win-x64.pubxml similarity index 72% rename from Samples/ItemsViewIntegrationApp/ItemsViewIntegrationApp/Properties/PublishProfiles/win10-x64.pubxml rename to perf/scenarios/XAMLPerf.UnpackagedApp.Cs.MUX/Properties/PublishProfiles/win-x64.pubxml index 4da0fea29b..bd658a4abf 100644 --- a/Samples/ItemsViewIntegrationApp/ItemsViewIntegrationApp/Properties/PublishProfiles/win10-x64.pubxml +++ b/perf/scenarios/XAMLPerf.UnpackagedApp.Cs.MUX/Properties/PublishProfiles/win-x64.pubxml @@ -1,4 +1,4 @@ - + @@ -6,7 +6,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121. FileSystem x64 - win10-x64 + win-x64 + win10-x64 bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\ true False diff --git a/Samples/ItemsViewIntegrationApp/ItemsViewIntegrationApp/Properties/PublishProfiles/win10-x86.pubxml b/perf/scenarios/XAMLPerf.UnpackagedApp.Cs.MUX/Properties/PublishProfiles/win-x86.pubxml similarity index 72% rename from Samples/ItemsViewIntegrationApp/ItemsViewIntegrationApp/Properties/PublishProfiles/win10-x86.pubxml rename to perf/scenarios/XAMLPerf.UnpackagedApp.Cs.MUX/Properties/PublishProfiles/win-x86.pubxml index c94522ca94..ec8f1e2def 100644 --- a/Samples/ItemsViewIntegrationApp/ItemsViewIntegrationApp/Properties/PublishProfiles/win10-x86.pubxml +++ b/perf/scenarios/XAMLPerf.UnpackagedApp.Cs.MUX/Properties/PublishProfiles/win-x86.pubxml @@ -1,4 +1,4 @@ - + @@ -6,7 +6,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121. FileSystem x86 - win10-x86 + win-x86 + win10-x86 bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\ true False diff --git a/perf/scenarios/XAMLPerf.UnpackagedApp.Cs.MUX/XAMLPerf.UnpackagedApp.Cs.MUX.csproj b/perf/scenarios/XAMLPerf.UnpackagedApp.Cs.MUX/XAMLPerf.UnpackagedApp.Cs.MUX.csproj index 3838e68735..41ad2424a8 100644 --- a/perf/scenarios/XAMLPerf.UnpackagedApp.Cs.MUX/XAMLPerf.UnpackagedApp.Cs.MUX.csproj +++ b/perf/scenarios/XAMLPerf.UnpackagedApp.Cs.MUX/XAMLPerf.UnpackagedApp.Cs.MUX.csproj @@ -1,13 +1,14 @@ WinExe - $(WindowsAppSdkTargetFrameworkMoniker) + $(DotNetCoreTargetFrameworkMoniker) $(WindowsAppSdkTargetPlatformVersion) XAMLPerf.UnpackagedApp.Cs.MUX app.manifest x86;x64;ARM64 - win10-x86;win10-x64;win10-arm64 - win10-$(Platform).pubxml + win-x86;win-x64;win-arm64 + win10-x86;win10-x64;win10-arm64 + win-$(Platform).pubxml true true None