Remove CPM

RiversideValley · Jan 4, 2025 · 2c2f2b4 · 2c2f2b4
1 parent 57323c9
commit 2c2f2b4
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 58 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
diff --git a/src/Riverside.GlowUI.Materials/Riverside.GlowUI.Materials.csproj b/src/Riverside.GlowUI.Materials/Riverside.GlowUI.Materials.csproj
@@ -14,7 +14,8 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
-    <PackageReference Include="Microsoft.WindowsAppSDK" />
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.241114003" />
   </ItemGroup>
+
 </Project>
diff --git a/src/Riverside.GlowUI/Riverside.GlowUI.csproj b/src/Riverside.GlowUI/Riverside.GlowUI.csproj
@@ -7,7 +7,8 @@
     <UseWinUI>true</UseWinUI>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
-    <PackageReference Include="Microsoft.WindowsAppSDK" />
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.241114003" />
   </ItemGroup>
+
 </Project>
diff --git a/src/Riverside.Toolkit.Flyouts/Riverside.Toolkit.Flyouts.csproj b/src/Riverside.Toolkit.Flyouts/Riverside.Toolkit.Flyouts.csproj
@@ -13,33 +13,38 @@
     <None Remove="TransparentWindow.xaml" />
     <None Remove="Widgets\TestWidget.xaml" />
   </ItemGroup>
+
   <ItemGroup>
-    <PackageReference Include="CommunityToolkit.Mvvm" />
-    <PackageReference Include="CommunityToolkit.WinUI.UI.Media" />
-    <PackageReference Include="H.NotifyIcon" />
-    <PackageReference Include="Microsoft.Windows.CsWin32">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.WindowsAppSDK" />
-    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
-    <PackageReference Include="WinUIEx" />
+      <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.0" />
+      <PackageReference Include="CommunityToolkit.WinUI.UI.Media" Version="7.1.2" />
+      <PackageReference Include="H.NotifyIcon" Version="2.0.108" />
+      <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.2-beta">
+        <PrivateAssets>all</PrivateAssets>
+        <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      </PackageReference>
+      <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.3.230502000" />
+      <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.1" />
+      <PackageReference Include="WinUIEx" Version="2.2.0" />
   </ItemGroup>
+
   <ItemGroup>
     <Page Update="DesktopWidgetWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
     </Page>
   </ItemGroup>
+
   <ItemGroup>
     <Page Update="TransparentWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
     </Page>
   </ItemGroup>
+
   <ItemGroup>
     <Page Update="FlyoutWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
     </Page>
   </ItemGroup>
+
   <ItemGroup>
     <Page Update="BaseWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
@@ -49,4 +54,4 @@
       <SubType>Designer</SubType>
     </Page>
   </ItemGroup>
-</Project>
+</Project>
diff --git a/src/Riverside.Toolkit/Riverside.Toolkit.csproj b/src/Riverside.Toolkit/Riverside.Toolkit.csproj
@@ -14,37 +14,42 @@
     <None Remove="Controls\Toolkit\DropShadowPanel.xaml" />
     <None Remove="Themes\Generic.xaml" />
   </ItemGroup>
+
   <ItemGroup>
-    <PackageReference Include="CommunityToolkit.Mvvm" />
-    <PackageReference Include="CommunityToolkit.WinUI.UI.Controls" />
-    <PackageReference Include="CommunityToolkit.WinUI.UI.Media" />
-    <PackageReference Include="DependencyPropertyGenerator">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.WindowsAppSDK" />
-    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
-    <PackageReference Include="Riverside.ComponentModel" />
-    <PackageReference Include="WinUIEx" />
+      <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
+      <PackageReference Include="CommunityToolkit.WinUI.UI.Controls" Version="7.1.2" />
+      <PackageReference Include="CommunityToolkit.WinUI.UI.Media" Version="7.1.2" />
+      <PackageReference Include="DependencyPropertyGenerator" Version="1.4.0">
+        <PrivateAssets>all</PrivateAssets>
+        <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      </PackageReference>
+      <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.241114003" />
+      <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" />
+      <PackageReference Include="Riverside.ComponentModel" Version="0.3.1" />
+      <PackageReference Include="WinUIEx" Version="2.5.0" />
   </ItemGroup>
+
   <ItemGroup>
     <Page Update="Controls\Settings\SettingsDisplayControl.xaml">
       <Generator>MSBuild:Compile</Generator>
     </Page>
   </ItemGroup>
+
   <ItemGroup>
     <Page Update="Controls\Settings\SettingsBlockControl.xaml">
       <Generator>MSBuild:Compile</Generator>
     </Page>
   </ItemGroup>
+
   <ItemGroup>
     <Page Update="Themes\Generic.xaml">
       <SubType>Designer</SubType>
     </Page>
   </ItemGroup>
+
   <ItemGroup>
     <Page Update="Controls\Toolkit\DropShadowPanel.xaml">
       <Generator>MSBuild:Compile</Generator>
     </Page>
   </ItemGroup>
-</Project>
+</Project>
diff --git a/tests/Riverside.Toolkit.UITests/Riverside.Toolkit.UITests.csproj b/tests/Riverside.Toolkit.UITests/Riverside.Toolkit.UITests.csproj
@@ -10,16 +10,18 @@
     <UseWinUI>true</UseWinUI>
     <EnableMsixTooling>true</EnableMsixTooling>
     <Nullable>enable</Nullable>
-    <PublishAot>true</PublishAot>
+	  <PublishAot>true</PublishAot>
   </PropertyGroup>
   <ItemGroup>
     <None Remove="Assets\Rebound.ico" />
   </ItemGroup>
+
   <ItemGroup>
     <Page Remove="UnitTestApp.xaml" />
     <ApplicationDefinition Include="UnitTestApp.xaml" />
     <ProjectCapability Include="TestContainer" />
   </ItemGroup>
+
   <ItemGroup>
     <Content Include="Assets\SplashScreen.scale-200.png" />
     <Content Include="Assets\LockScreenLogo.scale-200.png" />
@@ -29,9 +31,11 @@
     <Content Include="Assets\StoreLogo.png" />
     <Content Include="Assets\Wide310x150Logo.scale-200.png" />
   </ItemGroup>
+
   <ItemGroup>
     <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
@@ -41,16 +45,17 @@
     <ProjectCapability Include="Msix" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Graphics.Win2D" />
-    <PackageReference Include="Microsoft.TestPlatform.TestHost" />
-    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
-    <PackageReference Include="Microsoft.WindowsAppSDK" />
-    <PackageReference Include="MSTest.TestAdapter" />
-    <PackageReference Include="MSTest.TestFramework" />
+    <PackageReference Include="Microsoft.Graphics.Win2D" Version="1.3.1" />
+    <PackageReference Include="Microsoft.TestPlatform.TestHost" Version="17.12.0" />
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.241114003" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.7.0" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.7.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Riverside.Toolkit\Riverside.Toolkit.csproj" />
   </ItemGroup>
+
   <!-- 
     Defining the "HasPackageAndPublishMenuAddedByProject" property here allows the Solution 
     Explorer "Package and Publish" context menu entry to be enabled for this project even if 
@@ -59,10 +64,11 @@
   <PropertyGroup Condition="'$(DisableHasPackageAndPublishMenuAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
     <HasPackageAndPublishMenu>true</HasPackageAndPublishMenu>
   </PropertyGroup>
+
   <!-- Publish Properties -->
   <PropertyGroup>
     <PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
     <PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun>
     <PublishTrimmed>False</PublishTrimmed>
   </PropertyGroup>
-</Project>
+</Project>