diff --git a/.github/workflows/BuildSuccess_Check.yaml b/.github/workflows/BuildSuccess_Check.yaml
index d10256329a..9f61c01875 100644
--- a/.github/workflows/BuildSuccess_Check.yaml
+++ b/.github/workflows/BuildSuccess_Check.yaml
@@ -27,19 +27,19 @@ jobs:
       uses: microsoft/setup-msbuild@v2
     - name: Build MAUI (Windows)
       run: |
-        msbuild /restore /t:Build src/MAUI/ArcGIS.Samples.MAUI.sln /p:Configuration=Release /p:CentralPackageManagementEnabled=true /p:TargetFramework=net9.0-windows10.0.19041.0 /p:RuntimeIdentifier=win10-x64 /p:RuntimeIdentifierOverride=win10-x64 /p:UseRidGraph=true
+        msbuild /restore /t:Build src/MAUI/ArcGIS.Samples.MAUI.sln /p:Configuration=Release /p:CentralPackageManagementEnabled=true /p:TargetFramework=net10.0-windows10.0.19041.0 /p:RuntimeIdentifier=win10-x64 /p:RuntimeIdentifierOverride=win10-x64 /p:UseRidGraph=true
     
     - name: Build MAUI (Android)
       run: |
-        msbuild /restore /t:Build src/MAUI/ArcGIS.Samples.MAUI.sln /p:Configuration=Release /p:CentralPackageManagementEnabled=true /p:TargetFramework=net9.0-android
+        msbuild /restore /t:Build src/MAUI/ArcGIS.Samples.MAUI.sln /p:Configuration=Release /p:CentralPackageManagementEnabled=true /p:TargetFramework=net10.0-android
     
     - name: Build MAUI (iOS)
       run: |
-        msbuild /restore /t:Build src/MAUI/ArcGIS.Samples.MAUI.sln /p:Configuration=Release /p:CentralPackageManagementEnabled=true /p:TargetFramework=net9.0-ios
+        msbuild /restore /t:Build src/MAUI/ArcGIS.Samples.MAUI.sln /p:Configuration=Release /p:CentralPackageManagementEnabled=true /p:TargetFramework=net10.0-ios
     
     - name: Build MAUI (Mac)
       run: |
-        msbuild /restore /t:Build src/MAUI/ArcGIS.Samples.MAUI.sln /p:Configuration=Release /p:CentralPackageManagementEnabled=true /p:TargetFramework=net9.0-maccatalyst
+        msbuild /restore /t:Build src/MAUI/ArcGIS.Samples.MAUI.sln /p:Configuration=Release /p:CentralPackageManagementEnabled=true /p:TargetFramework=net10.0-maccatalyst
 
 
 # WPF .NET Build
diff --git a/src/MAUI/Maui.Samples/ArcGIS.Samples.Maui.csproj b/src/MAUI/Maui.Samples/ArcGIS.Samples.Maui.csproj
index 1a7a44348f..d8ef2e3cb4 100644
--- a/src/MAUI/Maui.Samples/ArcGIS.Samples.Maui.csproj
+++ b/src/MAUI/Maui.Samples/ArcGIS.Samples.Maui.csproj
@@ -142,7 +142,8 @@
     <ProjectReference Include="..\..\Samples.CatalogGenerator\Samples.CatalogGenerator.csproj"
                       OutputItemType="Analyzer"
                       ReferenceOutputAssembly="false"
-                      PrivateAssets="all" />
+                      PrivateAssets="all"
+                      SetTargetFramework="TargetFramework=netstandard2.0" />
   </ItemGroup>
 
   <!-- WinUIEx is used to workaround the lack of a WebAuthenticationBroker for WinUI. https://github.com/microsoft/WindowsAppSDK/issues/441 -->
diff --git a/src/WPF/WPF.StorePackage/ArcGIS.WPF.StorePackage.wapproj b/src/WPF/WPF.StorePackage/ArcGIS.WPF.StorePackage.wapproj
index 009f746c4f..52aea526f7 100644
--- a/src/WPF/WPF.StorePackage/ArcGIS.WPF.StorePackage.wapproj
+++ b/src/WPF/WPF.StorePackage/ArcGIS.WPF.StorePackage.wapproj
@@ -55,7 +55,7 @@
     <None Include="ArcGIS.WPF.StorePackage_TemporaryKey.pfx" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\WPF.Viewer\ArcGIS.WPF.Viewer.Net.csproj" AdditionalProperties="TargetFramework=net8.0-windows10.0.19041.0">
+    <ProjectReference Include="..\WPF.Viewer\ArcGIS.WPF.Viewer.Net.csproj">
       <PublishProfile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Properties\PublishProfiles\win-x64-release.pubxml</PublishProfile>
       <PublishProfile Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Properties\PublishProfiles\win-arm64-release.pubxml</PublishProfile>
     </ProjectReference>
diff --git a/src/WPF/WPF.Viewer/ArcGIS.WPF.Viewer.Net.csproj b/src/WPF/WPF.Viewer/ArcGIS.WPF.Viewer.Net.csproj
index f5b9ed0b3b..6d594ad64d 100644
--- a/src/WPF/WPF.Viewer/ArcGIS.WPF.Viewer.Net.csproj
+++ b/src/WPF/WPF.Viewer/ArcGIS.WPF.Viewer.Net.csproj
@@ -68,7 +68,8 @@
     <ProjectReference Include="..\..\Samples.CatalogGenerator\Samples.CatalogGenerator.csproj"
                       OutputItemType="Analyzer"
                       ReferenceOutputAssembly="false"
-                      PrivateAssets="all" />
+                      PrivateAssets="all"
+                      SetTargetFramework="TargetFramework=netstandard2.0" />
   </ItemGroup>
   <ItemGroup>
     <Compile Update="Converters\*.cs">
diff --git a/src/WinUI/ArcGIS.WinUI.Viewer/ArcGIS.WinUI.Viewer.csproj b/src/WinUI/ArcGIS.WinUI.Viewer/ArcGIS.WinUI.Viewer.csproj
index 05a5aed554..bd34d599e3 100644
--- a/src/WinUI/ArcGIS.WinUI.Viewer/ArcGIS.WinUI.Viewer.csproj
+++ b/src/WinUI/ArcGIS.WinUI.Viewer/ArcGIS.WinUI.Viewer.csproj
@@ -75,7 +75,8 @@
     <ProjectReference Include="..\..\Samples.CatalogGenerator\Samples.CatalogGenerator.csproj"
                       OutputItemType="Analyzer"
                       ReferenceOutputAssembly="false"
-                      PrivateAssets="all" />
+                      PrivateAssets="all"
+                      SetTargetFramework="TargetFramework=netstandard2.0" />
   </ItemGroup>
 
   <ItemGroup>