Merge pull request #957 from dorssel/fix_publish

Do not publish package lock file
dorssel · May 22, 2024 · 878febe · 878febe
2 parents 9b802ad + 2f6e4e0
commit 878febe
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -44,17 +44,19 @@ SPDX-License-Identifier: GPL-3.0-only
 
     <!-- Common defaults -->
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-    <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
-    <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
-    <RestoreLockedMode Condition="'$(GITHUB_ACTIONS)' == 'true'">true</RestoreLockedMode>
-    <ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">true</ContinuousIntegrationBuild>
     <InvariantGlobalization>true</InvariantGlobalization>
     <SelfContained>false</SelfContained>
     <IsPackable>false</IsPackable>
     <IsPublishable>false</IsPublishable>
     <GenerateDependencyFile>false</GenerateDependencyFile>
     <AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
 
+    <!-- Deterministic builds -->
+    <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
+    <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
+    <RestoreLockedMode Condition="'$(GITHUB_ACTIONS)' == 'true'">true</RestoreLockedMode>
+    <ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">true</ContinuousIntegrationBuild>
+
     <Product>usbipd-win</Product>
     <Company>Frans van Dorsselaer</Company>
     <Copyright>Copyright (C) $([System.DateTime]::UtcNow.ToString("yyyy"))  $(Company)</Copyright>

diff --git a/Usbipd/Usbipd.csproj b/Usbipd/Usbipd.csproj
@@ -21,6 +21,11 @@ SPDX-License-Identifier: GPL-3.0-only
     <AssemblyName>usbipd</AssemblyName>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Content Remove="packages.lock.json" />
+    <None Include="packages.lock.json" />
+  </ItemGroup>
+
   <ItemGroup>
     <Content Include="..\COPYING.md" Link="COPYING.md" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>