introduce SailsPackagesVersionOverride

gear-tech · Dec 3, 2024 · 2cd5692 · 2cd5692
1 parent 7c813a0
commit 2cd5692
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/net-release.yml b/.github/workflows/net-release.yml
@@ -173,7 +173,7 @@ jobs:
           dotnet nuget add source ${{ github.workspace }}/nugets --name local
           dotnet build --configuration Release \
             -p:LibraryRoot=${{ github.workspace }}/native_client_gens \
-            -p:SailsPackagesVersion=${{ needs.prepare.outputs.r_version }}
+            -p:SailsPackagesVersionOverride=${{ needs.prepare.outputs.r_version }}
           dotnet test --no-build --configuration Release --logger "trx;LogFileName=TestResults.trx"
 
       - name: Publish NuGet Packages to NuGet.org

diff --git a/net/Directory.Build.props b/net/Directory.Build.props
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <SailsPackagesVersionInternal Condition="'$(SailsPackagesVersion)' == ''">0.0.1-beta.6</SailsPackagesVersionInternal>
-    <SailsPackagesVersionInternal Condition="'$(SailsPackagesVersion)' != ''">$(SailsPackagesVersion)</SailsPackagesVersionInternal>
+    <SailsPackagesVersion Condition="'$(SailsPackagesVersionOverride)' == ''">0.0.1-beta.6</SailsPackagesVersion>
+    <SailsPackagesVersion Condition="'$(SailsPackagesVersionOverride)' != ''">$(SailsPackagesVersionOverride)</SailsPackagesVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/net/Directory.Packages.props b/net/Directory.Packages.props
@@ -34,7 +34,7 @@
     <PackageVersion Include="System.Net.Http" Version="4.3.4" />
     <PackageVersion Include="System.Text.Json" Version="9.0.0" />
     <!-- Examples -->
-    <PackageVersion Include="Sails.ClientGenerator" Version="$(SailsPackagesVersionInternal)" />
-    <PackageVersion Include="Sails.Net" Version="$(SailsPackagesVersionInternal)" />
+    <PackageVersion Include="Sails.ClientGenerator" Version="$(SailsPackagesVersion)" />
+    <PackageVersion Include="Sails.Net" Version="$(SailsPackagesVersion)" />
   </ItemGroup>
 </Project>