Merge branch 'main' into unit

Author: Niklas Gustafsson

Directory.Build.props

@@ -87,6 +87,7 @@
   <!-- we manually update these -->
   <PropertyGroup Condition="'$(MSBuildProjectName.IndexOf(`libtorch-`))' != '-1'">
     <LibTorchPackageVersion>2.2.1.1</LibTorchPackageVersion>
+    <PreviousPackageVersion>2.2.1.1</PreviousPackageVersion>
     <VersionPrefix>$(LibTorchPackageVersion)</VersionPrefix>
     <VersionSuffix></VersionSuffix>
   </PropertyGroup>

build/BranchInfo.props

@@ -3,6 +3,7 @@
     <MajorVersion>0</MajorVersion>
     <MinorVersion>102</MinorVersion>
     <PatchVersion>7</PatchVersion>
+    <PreviousPackageVersion>0.102.6</PreviousPackageVersion>
   </PropertyGroup>
 
 </Project>

pkg/Directory.Build.targets

@@ -0,0 +1,8 @@
+<Project>
+  <Import Project="..\Directory.Build.targets" />
+
+  <PropertyGroup Condition="'$(IsPackable)' != 'false'">
+    <EnablePackageValidation>true</EnablePackageValidation>
+    <PackageValidationBaselineVersion>$(PreviousPackageVersion)</PackageValidationBaselineVersion>
+  </PropertyGroup>
+</Project>

src/Native/LibTorchSharp/CMakeLists.txt

@@ -78,13 +78,13 @@ if(APPLE)
     set_target_properties(LibTorchSharp PROPERTIES INSTALL_RPATH "@loader_path;@executable_path;")
 endif()
 
-if(NOT WIN32)
-    # Set C++ standard
-    set_target_properties(LibTorchSharp PROPERTIES
-        CXX_STANDARD 17
-        CXX_STANDARD_REQUIRED ON
-    )
+# Set C++ standard
+set_target_properties(LibTorchSharp PROPERTIES
+    CXX_STANDARD 17
+    CXX_STANDARD_REQUIRED ON
+)
 
+if(NOT WIN32)
     # Add C++ specific compile options
     target_compile_options(LibTorchSharp PRIVATE
         $<$<COMPILE_LANGUAGE:CXX>:-std=c++17>