vpenades hai 1 ano
pai
achega
0942c51366
Modificáronse 3 ficheiros con 25 adicións e 37 borrados
  1. 3 32
      .github/workflows/BuildPackages.yml
  2. 22 0
      build.sh
  3. 0 5
      src/Directory.Build.props

+ 3 - 32
.github/workflows/BuildPackages.yml

@@ -36,41 +36,12 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v4      
 
-      # ---------------------------------------------  variables
-
-    - name: Define SemVer suffix
-      run: |          
-          NUGETSEMVER="${{ inputs.nuget-semver }}"          
-
-          # replace DATE
-          DATE_SHORT=$(date +'%Y%m%d')
-          if [[ "NUGETSEMVER" == *"$DATE"* ]]; then
-          NUGETSEMVER="${NUGETSEMVER/DATE/$DATE_SHORT}"
-          fi
-
-          # replace TIME
-          TIME_SHORT=$(date +'%H%M%S')          
-          if [[ "NUGETSEMVER" == *"$TIME"* ]]; then
-          NUGETSEMVER="${NUGETSEMVER/TIME/$TIME_SHORT}"
-          fi
-
-          # emit env variable
-          echo "DOTNET_NUGETSEMVER=$NUGETSEMVER" >> $GITHUB_ENV          
-          echo ${{ env.DOTNET_NUGETSEMVER }}
-
       # ---------------------------------------------  build
 
-    - name: Install tools
-      run: dotnet tool restore
-
-    - name: Install dependencies
-      run: dotnet restore
-
     - name: Build
-      run: dotnet build -c Release /p:Version=${{ env.DOTNET_NUGETSEMVER }}
-    
-    - name: Pack
-      run: dotnet pack -c Release --no-build --output "."
+      run: |
+        chmod +x build.sh
+        build.sh $nuget-semver
 
       # ---------------------------------------------  publish
 

+ 22 - 0
build.sh

@@ -0,0 +1,22 @@
+
+# set input or default
+
+DEFAULTSEMVER="1.0.0-Test-DATE-TIME"
+NUGETSEMVER=${1:-$DEFAULTSEMVER}
+
+# replace date
+DATE_SHORT=$(date +'%Y%m%d')
+NUGETSEMVER="${NUGETSEMVER/DATE/$DATE_SHORT}"
+
+# replace time
+TIME_SHORT=$(date +'%H%M%S')
+NUGETSEMVER="${NUGETSEMVER/TIME/$TIME_SHORT}"
+
+# report semver
+echo "Semver: $NUGETSEMVER";
+
+# build
+
+dotnet restore
+
+dotnet pack -c Release --output "." -p:PackageVersion=$NUGETSEMVER

+ 0 - 5
src/Directory.Build.props

@@ -95,11 +95,6 @@
     <PackageProjectUrl>https://github.com/vpenades/SharpGLTF</PackageProjectUrl>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>    
   </PropertyGroup>  
-  
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <VersionPrefix>1.0.0</VersionPrefix>
-    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-  </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <Deterministic>true</Deterministic>