Merge remote-tracking branch 'la-vache/master' into sourcery

eggrobin · Dec 30, 2024 · 5b5e2e1 · 5b5e2e1
2 parents 15721e1 + cbfb62e
commit 5b5e2e1
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 17 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -117,6 +117,14 @@ jobs:
         configuration: ${{ matrix.configuration }}
         directory: Google
 
+    - name: Download protobuf Release artifact
+      uses: mockingbirdnest/actions/windows/download_artifact@main
+      if: ${{ matrix.configuration == 'Debug' }}
+      with:
+        name: protobuf
+        configuration: Release
+        directory: Google
+
     - name: Download zfp artifact
       uses: mockingbirdnest/actions/windows/download_artifact@main
       with:

diff --git a/ksp_plugin_adapter/main_window.cs b/ksp_plugin_adapter/main_window.cs
@@ -7,10 +7,10 @@ namespace ksp_plugin_adapter {
 
 internal class MainWindow : VesselSupervisedWindowRenderer {
   // Update this section before each release.
-  private const string next_release_name = "Kummer";
-  private const int next_release_lunation_number = 309;
+  private const string next_release_name = "Kuratowski";
+  private const int next_release_lunation_number = 310;
   private readonly DateTimeOffset next_release_date_ =
-      new DateTimeOffset(2024, 12, 30, 22, 26, 48, TimeSpan.Zero);
+      new DateTimeOffset(2025, 01, 29, 12, 35, 59, TimeSpan.Zero);
 
   public MainWindow(
       PrincipiaPluginAdapter adapter,

diff --git a/nanobenchmarks/nanobenchmarks.vcxproj b/nanobenchmarks/nanobenchmarks.vcxproj
@@ -4,24 +4,14 @@
     <VCProjectVersion>17.0</VCProjectVersion>
     <ProjectGuid>{1c6654c0-14e2-4a9e-b0e6-508b84fa8a0e}</ProjectGuid>
     <RootNamespace>nanobenchmarks</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
+  <Import Project="$(SolutionDir)principia.props" />
   <ImportGroup Label="ExtensionSettings">
     <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
   </ImportGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Link>
-      <AdditionalDependencies>gmock.lib;gmock_main.lib;powrprof.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+  <ItemDefinitionGroup>
     <Link>
-      <AdditionalDependencies>gmock.lib;gmock_main.lib;powrprof.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_LLVM|x64'">
-    <Link>
-      <AdditionalDependencies>gmock.lib;gmock_main.lib;powrprof.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>powrprof.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -42,7 +32,6 @@
   <ImportGroup Label="ExtensionTargets">
     <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
   </ImportGroup>
-  <Import Project="$(SolutionDir)principia.props" />
   <ImportGroup Label="Shared">
     <Import Project="..\shared\base.vcxitems" Label="Shared" />
     <Import Project="..\shared\numerics.vcxitems" Label="Shared" />

diff --git a/principia.props b/principia.props
@@ -34,6 +34,7 @@
     <PrincipiaTestProject Condition="$(ProjectName) == ksp_plugin or
                                      $(ProjectName) == serialization or
                                      $(ProjectName) == benchmarks or
+                                     $(ProjectName) == nanobenchmarks or
                                      $(ProjectName) == tools">false</PrincipiaTestProject>
     <!--Dependency paths.-->
     <PrincipiaDependencyConfiguration>Debug</PrincipiaDependencyConfiguration>