Merge branch develop v9.3.1-210910.0149

anoyetta · Sep 9, 2021 · bbe581f · bbe581f
2 parents 2cf6e35 + 082c185
commit bbe581f
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 5 deletions.
diff --git a/source/@MasterVersion.txt b/source/@MasterVersion.txt
@@ -1 +1 @@
-v9.3.0
+v9.3.1
diff --git a/source/ACT.Hojoring.Common/Version.cs b/source/ACT.Hojoring.Common/Version.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("9.3.0.0")]
-[assembly: AssemblyFileVersion("9.3.0.0")]
+[assembly: AssemblyVersion("9.3.0.1")]
+[assembly: AssemblyFileVersion("9.3.0.1")]
diff --git a/source/ACT.UltraScouter/ACT.UltraScouter/ACT.UltraScouter.csproj b/source/ACT.UltraScouter/ACT.UltraScouter/ACT.UltraScouter.csproj
@@ -13,6 +13,7 @@
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
     <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+    <CopySQLiteInteropFiles>false</CopySQLiteInteropFiles>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -96,6 +97,16 @@
       <Version>4.3.1</Version>
     </PackageReference>
   </ItemGroup>
+  <Target Name="EmbedSQLiteInteropFiles" BeforeTargets="ResolveReferences">
+    <ItemGroup>
+        <!-- Condition on item metadata trick adapted from https://stackoverflow.com/questions/5103026/in-msbuild-can-i-use-the-string-replace-function-on-a-metadata-item/8904902#8904902 -->
+        <EmbeddedResource Include="@(SQLiteInteropFiles)">
+            <!-- Syntax could be simplified in the future in MSBuild, see [Metadata should support instance methods](https://github.com/microsoft/msbuild/issues/1155) -->
+            <Link Condition="$([MSBuild]::ValueOrDefault('%(Identity)', '').Contains('x86'))">costura32\%(Filename)%(Extension)</Link>
+            <Link Condition="$([MSBuild]::ValueOrDefault('%(Identity)', '').Contains('x64'))">costura64\%(Filename)%(Extension)</Link>
+        </EmbeddedResource>
+    </ItemGroup>
+  </Target>
   <ItemGroup>
     <Content Include="ACT.Hojoring.ico" />
     <Content Include="FodyWeavers.xml" />
@@ -110,4 +121,4 @@
     <PreBuildEvent>
     </PreBuildEvent>
   </PropertyGroup>
-</Project>
+</Project>
diff --git a/source/FFLogsRankingDonwloader/FFLogsRankingDonwloader.csproj b/source/FFLogsRankingDonwloader/FFLogsRankingDonwloader.csproj
@@ -15,6 +15,7 @@
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
     <TargetFrameworkProfile />
+    <CopySQLiteInteropFiles>false</CopySQLiteInteropFiles>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -95,9 +96,19 @@
       <Version>1.0.112</Version>
     </PackageReference>
   </ItemGroup>
+  <Target Name="EmbedSQLiteInteropFiles" BeforeTargets="ResolveReferences">
+    <ItemGroup>
+        <!-- Condition on item metadata trick adapted from https://stackoverflow.com/questions/5103026/in-msbuild-can-i-use-the-string-replace-function-on-a-metadata-item/8904902#8904902 -->
+        <EmbeddedResource Include="@(SQLiteInteropFiles)">
+            <!-- Syntax could be simplified in the future in MSBuild, see [Metadata should support instance methods](https://github.com/microsoft/msbuild/issues/1155) -->
+            <Link Condition="$([MSBuild]::ValueOrDefault('%(Identity)', '').Contains('x86'))">costura32\%(Filename)%(Extension)</Link>
+            <Link Condition="$([MSBuild]::ValueOrDefault('%(Identity)', '').Contains('x64'))">costura64\%(Filename)%(Extension)</Link>
+        </EmbeddedResource>
+    </ItemGroup>
+  </Target>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>
     </PostBuildEvent>
   </PropertyGroup>
-</Project>
+</Project>