Attempt to fix source generator issues (#556)

* Changed some properties of source generator project * Remove accelerate
bkaankose · Feb 14, 2025 · 30f1257 · 30f1257
1 parent f007cef
commit 30f1257
Show file tree

Hide file tree

Showing 6 changed files with 75 additions and 76 deletions.
diff --git a/Directory.Build.Props b/Directory.Build.Props
@@ -2,5 +2,6 @@
 	<PropertyGroup>
 		<LangVersion>preview</LangVersion>
 		<IsAotCompatible>true</IsAotCompatible>
+		<Configurations>Debug;Release</Configurations>
 	</PropertyGroup>
 </Project>
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -1,63 +1,65 @@
 <Project>
-  <PropertyGroup>
-    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageVersion Include="ColorHashSharp" Version="1.0.0" />
-    <PackageVersion Include="CommunityToolkit.Common" Version="8.4.0" />
-    <PackageVersion Include="CommunityToolkit.Diagnostics" Version="8.4.0" />
-    <PackageVersion Include="CommunityToolkit.Labs.Uwp.Controls.MarkdownTextBlock" Version="0.1.250206-build.2040" />
-    <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0" />
-    <PackageVersion Include="CommunityToolkit.Uwp.Animations" Version="8.2.250129-preview2" />
-    <PackageVersion Include="CommunityToolkit.Uwp.Behaviors" Version="8.2.250129-preview2" />
-    <PackageVersion Include="CommunityToolkit.Uwp.Controls.Segmented" Version="8.2.250129-preview2" />
-    <PackageVersion Include="CommunityToolkit.Uwp.Controls.SettingsControls" Version="8.2.250129-preview2" />
-    <PackageVersion Include="CommunityToolkit.Uwp.Controls.Sizers" Version="8.2.250129-preview2" />
-    <PackageVersion Include="CommunityToolkit.Uwp.Controls.TabbedCommandBar" Version="8.2.250129-preview2" />
-    <PackageVersion Include="CommunityToolkit.Uwp.Controls.TokenizingTextBox" Version="8.2.250129-preview2" />
-    <PackageVersion Include="CommunityToolkit.Uwp.Extensions" Version="8.2.250129-preview2" />
-    <PackageVersion Include="EmailValidation" Version="1.2.0" />
-    <PackageVersion Include="HtmlAgilityPack" Version="1.11.72" />
-    <PackageVersion Include="Ical.Net" Version="4.3.1" />
-    <PackageVersion Include="IsExternalInit" Version="1.0.3" />
-    <PackageVersion Include="Microsoft.AppCenter.Analytics" Version="5.0.6" />
-    <PackageVersion Include="Microsoft.AppCenter.Crashes" Version="5.0.6" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.2" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.2" />
-    <PackageVersion Include="Microsoft.Graph" Version="5.69.0" />
-    <PackageVersion Include="Microsoft.Identity.Client" Version="4.68.0" />
-    <PackageVersion Include="Microsoft.Identity.Client.Broker" Version="4.68.0" />
-    <PackageVersion Include="Microsoft.Identity.Client.Extensions.Msal" Version="4.68.0" />
-    <PackageVersion Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.14" />
-    <PackageVersion Include="Microsoft.UI.Xaml" Version="2.8.7" />
-    <PackageVersion Include="Microsoft.Xaml.Behaviors.Uwp.Managed" Version="3.0.0" />
-    <PackageVersion Include="MimeKit" Version="4.10.0" />
-    <PackageVersion Include="morelinq" Version="4.4.0" />
-    <PackageVersion Include="Nito.AsyncEx" Version="5.1.2" />
-    <PackageVersion Include="Nito.AsyncEx.Tasks" Version="5.1.2" />
-    <PackageVersion Include="NodaTime" Version="3.2.1" />
-    <PackageVersion Include="Serilog" Version="4.2.0" />
-    <PackageVersion Include="Serilog.Exceptions" Version="8.4.0" />
-    <PackageVersion Include="Serilog.Sinks.Debug" Version="3.0.0" />
-    <PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />
-    <PackageVersion Include="SkiaSharp" Version="3.116.1" />
-    <PackageVersion Include="sqlite-net-pcl" Version="1.9.172" />
-    <PackageVersion Include="SqlKata" Version="4.0.1" />
-    <PackageVersion Include="System.Private.Uri" Version="4.3.2" />
-    <PackageVersion Include="System.Text.Encoding.CodePages" Version="9.0.2" />
-    <PackageVersion Include="System.Text.Json" Version="9.0.2" />
-    <PackageVersion Include="Win2D.uwp" Version="1.28.2" />
-    <PackageVersion Include="H.NotifyIcon.Wpf" Version="2.2.0" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Notifications" Version="7.1.2" />
-    <PackageVersion Include="Google.Apis.Auth" Version="1.69.0" />
-    <PackageVersion Include="Google.Apis.Calendar.v3" Version="1.69.0.3667" />
-    <PackageVersion Include="Google.Apis.Gmail.v1" Version="1.68.0.3427" />
-    <PackageVersion Include="Google.Apis.PeopleService.v1" Version="1.68.0.3359" />
-    <PackageVersion Include="HtmlKit" Version="1.2.0" />
-    <PackageVersion Include="MailKit" Version="4.10.0" />
-    <PackageVersion Include="TimePeriodLibrary.NET" Version="2.1.5" />
-    <PackageVersion Include="System.Reactive" Version="6.0.1" />
-  </ItemGroup>
+	<PropertyGroup>
+		<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+	</PropertyGroup>
+	<ItemGroup>
+		<PackageVersion Include="ColorHashSharp" Version="1.0.0" />
+		<PackageVersion Include="CommunityToolkit.Common" Version="8.4.0" />
+		<PackageVersion Include="CommunityToolkit.Diagnostics" Version="8.4.0" />
+		<PackageVersion Include="CommunityToolkit.Labs.Uwp.Controls.MarkdownTextBlock" Version="0.1.250206-build.2040" />
+		<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0" />
+		<PackageVersion Include="CommunityToolkit.Uwp.Animations" Version="8.2.250129-preview2" />
+		<PackageVersion Include="CommunityToolkit.Uwp.Behaviors" Version="8.2.250129-preview2" />
+		<PackageVersion Include="CommunityToolkit.Uwp.Controls.Segmented" Version="8.2.250129-preview2" />
+		<PackageVersion Include="CommunityToolkit.Uwp.Controls.SettingsControls" Version="8.2.250129-preview2" />
+		<PackageVersion Include="CommunityToolkit.Uwp.Controls.Sizers" Version="8.2.250129-preview2" />
+		<PackageVersion Include="CommunityToolkit.Uwp.Controls.TabbedCommandBar" Version="8.2.250129-preview2" />
+		<PackageVersion Include="CommunityToolkit.Uwp.Controls.TokenizingTextBox" Version="8.2.250129-preview2" />
+		<PackageVersion Include="CommunityToolkit.Uwp.Extensions" Version="8.2.250129-preview2" />
+		<PackageVersion Include="EmailValidation" Version="1.2.0" />
+		<PackageVersion Include="HtmlAgilityPack" Version="1.11.72" />
+		<PackageVersion Include="Ical.Net" Version="4.3.1" />
+		<PackageVersion Include="IsExternalInit" Version="1.0.3" />
+		<PackageVersion Include="Microsoft.AppCenter.Analytics" Version="5.0.6" />
+		<PackageVersion Include="Microsoft.AppCenter.Crashes" Version="5.0.6" />
+		<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
+		<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0" />
+		<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.2" />
+		<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.2" />
+		<PackageVersion Include="Microsoft.Graph" Version="5.69.0" />
+		<PackageVersion Include="Microsoft.Identity.Client" Version="4.68.0" />
+		<PackageVersion Include="Microsoft.Identity.Client.Broker" Version="4.68.0" />
+		<PackageVersion Include="Microsoft.Identity.Client.Extensions.Msal" Version="4.68.0" />
+		<PackageVersion Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.14" />
+		<PackageVersion Include="Microsoft.UI.Xaml" Version="2.8.7" />
+		<PackageVersion Include="Microsoft.Xaml.Behaviors.Uwp.Managed" Version="3.0.0" />
+		<PackageVersion Include="MimeKit" Version="4.10.0" />
+		<PackageVersion Include="morelinq" Version="4.4.0" />
+		<PackageVersion Include="Nito.AsyncEx" Version="5.1.2" />
+		<PackageVersion Include="Nito.AsyncEx.Tasks" Version="5.1.2" />
+		<PackageVersion Include="NodaTime" Version="3.2.1" />
+		<PackageVersion Include="Serilog" Version="4.2.0" />
+		<PackageVersion Include="Serilog.Exceptions" Version="8.4.0" />
+		<PackageVersion Include="Serilog.Sinks.Debug" Version="3.0.0" />
+		<PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />
+		<PackageVersion Include="SkiaSharp" Version="3.116.1" />
+		<PackageVersion Include="sqlite-net-pcl" Version="1.9.172" />
+		<PackageVersion Include="SqlKata" Version="4.0.1" />
+		<PackageVersion Include="System.Private.Uri" Version="4.3.2" />
+		<PackageVersion Include="System.Text.Encoding.CodePages" Version="9.0.2" />
+		<PackageVersion Include="System.Text.Json" Version="9.0.2" />
+		<PackageVersion Include="Win2D.uwp" Version="1.28.2" />
+		<PackageVersion Include="H.NotifyIcon.Wpf" Version="2.2.0" />
+		<PackageVersion Include="CommunityToolkit.WinUI.Notifications" Version="7.1.2" />
+		<PackageVersion Include="Google.Apis.Auth" Version="1.69.0" />
+		<PackageVersion Include="Google.Apis.Calendar.v3" Version="1.69.0.3667" />
+		<PackageVersion Include="Google.Apis.Gmail.v1" Version="1.68.0.3427" />
+		<PackageVersion Include="Google.Apis.PeopleService.v1" Version="1.68.0.3359" />
+		<PackageVersion Include="HtmlKit" Version="1.2.0" />
+		<PackageVersion Include="MailKit" Version="4.10.0" />
+		<PackageVersion Include="TimePeriodLibrary.NET" Version="2.1.5" />
+		<PackageVersion Include="System.Reactive" Version="6.0.1" />
+		<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.2" />
+		<PackageVersion Include="System.Text.Encodings.Web" Version="9.0.2" />
+	</ItemGroup>
 </Project>
diff --git a/Wino.Authentication/Wino.Authentication.csproj b/Wino.Authentication/Wino.Authentication.csproj
@@ -3,7 +3,6 @@
 		<TargetFramework>net9.0</TargetFramework>
 		<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
 		<RootNamespace>Wino.Authentication</RootNamespace>
-		<Configurations>Debug;Release</Configurations>
 		<Platforms>x86;x64;arm64</Platforms>
 		<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
 		<ProduceReferenceAssembly>true</ProduceReferenceAssembly>

diff --git a/Wino.Core/Wino.Core.csproj b/Wino.Core/Wino.Core.csproj
@@ -3,7 +3,6 @@
 		<TargetFramework>net9.0</TargetFramework>
 		<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
 		<RootNamespace>Wino.Core</RootNamespace>
-		<Configurations>Debug;Release</Configurations>
 		<Platforms>x86;x64;arm64</Platforms>
 		<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
 		<ProduceReferenceAssembly>true</ProduceReferenceAssembly>

diff --git a/Wino.Mail/Properties/launchSettings.json b/Wino.Mail/Properties/launchSettings.json
@@ -1,7 +1,7 @@
 {
   "profiles": {
-    "App1": {
+    "Wino.Mail": {
       "commandName": "MsixPackage"
     }
   }
-}
+}
diff --git a/Wino.SourceGenerators/Wino.SourceGenerators.csproj b/Wino.SourceGenerators/Wino.SourceGenerators.csproj
@@ -9,27 +9,25 @@
 		<IsAotCompatible>false</IsAotCompatible>
 	</PropertyGroup>
 
-	<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
-		<DefineConstants>TRACE;DEBUG;NETFX_CORE</DefineConstants>
-	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)' != 'Debug'">
-		<DefineConstants>TRACE;RELEASE;NETFX_CORE</DefineConstants>
-		<Optimize>true</Optimize>
-	</PropertyGroup>
-
 	<ItemGroup>
 		<PackageReference Include="Microsoft.CodeAnalysis.CSharp" PrivateAssets="all" />
 		<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" PrivateAssets="all" />
-		<PackageReference Include="System.Text.Json" PrivateAssets="all" />
+	</ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="System.Text.Json" PrivateAssets="all" GeneratePathProperty="true" />
+		<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" PrivateAssets="all" GeneratePathProperty="true" />
+		<PackageReference Include="System.Text.Encodings.Web" PrivateAssets="all" GeneratePathProperty="true" />
 	</ItemGroup>
 
 	<PropertyGroup>
 		<GetTargetPathDependsOn>$(GetTargetPathDependsOn);GetDependencyTargetPaths</GetTargetPathDependsOn>
 	</PropertyGroup>
 
-	<Target Name="GetDependencyTargetPaths" AfterTargets="ResolvePackageDependenciesForBuild">
+	<Target Name="GetDependencyTargetPaths">
 		<ItemGroup>
-			<TargetPathWithTargetPlatformMoniker Include="@(ResolvedCompileFileDefinitions)" IncludeRuntimeDependency="false" />
+			<TargetPathWithTargetPlatformMoniker Include="$(PKGSystem_Text_Json)\lib\netstandard2.0\System.Text.Json.dll" IncludeRuntimeDependency="false" />
+			<TargetPathWithTargetPlatformMoniker Include="$(PKGMicrosoft_Bcl_AsyncInterfaces)\lib\netstandard2.0\Microsoft.Bcl.AsyncInterfaces.dll" IncludeRuntimeDependency="false" />
+			<TargetPathWithTargetPlatformMoniker Include="$(PKGSystem_Text_Encodings_Web)\lib\netstandard2.0\System.Text.Encodings.Web.dll" IncludeRuntimeDependency="false" />
 		</ItemGroup>
 	</Target>