From e5af8fe404b7ccc113677a652db56f4f0dc0f1b3 Mon Sep 17 00:00:00 2001
From: Camille Galladjov <ujinjinjin@outlook.com>
Date: Thu, 14 Jan 2021 22:19:51 +0300
Subject: [PATCH] Update nuget-release.yml

---
 .github/workflows/nuget-release.yml | 18 +++++++-----------
 Svelto.ECS/Svelto.ECS.csproj        |  2 +-
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/nuget-release.yml b/.github/workflows/nuget-release.yml
index e2908f2..2387f7e 100644
--- a/.github/workflows/nuget-release.yml
+++ b/.github/workflows/nuget-release.yml
@@ -17,7 +17,6 @@ jobs:
     env:
       PKG_NAME: Svelto.ECS
       ECS_VERSION_JSON: Svelto.ECS/version.json
-      COMMON_VERSION_JSON: Svelto.Common/version.json
 
     runs-on: ubuntu-latest
 
@@ -37,33 +36,30 @@ jobs:
       run: dotnet new sln -n "${PKG_NAME}" -o temp/
     
     # Svelto.Common
-    - name: get Svelto.Common version
-      run: python3 upm-preparator/version.py --version-file "${COMMON_VERSION_JSON}" --env-file "${GITHUB_ENV}"
-
     - name: create temp Svelto.Common directory
-      run: mkdir "temp/com.sebaslab.svelto.common@${PKG_VERSION}"
+      run: mkdir "temp/com.sebaslab.svelto.common"
     
     - name: copy Svelto.Common files to temp directory
-      run: cp -r Svelto.Common/* "temp/com.sebaslab.svelto.common@${PKG_VERSION}"
+      run: cp -r Svelto.Common/* "temp/com.sebaslab.svelto.common"
     
     - name: add Svelto.Common to solution
-      run: dotnet sln "temp/${PKG_NAME}.sln" add "temp/com.sebaslab.svelto.common@${PKG_VERSION}/Svelto.Common.csproj"
+      run: dotnet sln "temp/${PKG_NAME}.sln" add "temp/com.sebaslab.svelto.common/Svelto.Common.csproj"
     
     # Svelto.ECS
     - name: get Svelto.ECS version
       run: python3 upm-preparator/version.py --version-file "${ECS_VERSION_JSON}" --env-file "${GITHUB_ENV}"
 
     - name: create temp Svelto.ECS directory
-      run: mkdir "temp/com.sebaslab.svelto.ecs@${PKG_VERSION}"
+      run: mkdir "temp/com.sebaslab.svelto.ecs"
     
     - name: copy Svelto.ECS files to temp directory
-      run: cp -r Svelto.ECS/* "temp/com.sebaslab.svelto.ecs@${PKG_VERSION}"
+      run: cp -r Svelto.ECS/* "temp/com.sebaslab.svelto.ecs"
     
     - name: add Svelto.ECS to solution
-      run: dotnet sln "temp/${PKG_NAME}.sln" add "temp/com.sebaslab.svelto.ecs@${PKG_VERSION}/Svelto.ECS.csproj"
+      run: dotnet sln "temp/${PKG_NAME}.sln" add "temp/com.sebaslab.svelto.ecs/Svelto.ECS.csproj"
 
     - name: build nuget package
-      run: dotnet pack /p:Version=${PKG_VERSION} -o . "temp/com.sebaslab.svelto.ecs@${PKG_VERSION}/Svelto.ECS.csproj"
+      run: dotnet pack /p:Version=${PKG_VERSION} -o . "temp/com.sebaslab.svelto.ecs/Svelto.ECS.csproj"
 
     - name: publish nuget package
       run: dotnet nuget push ${{ env.PKG_NAME }}.${{ env.PKG_VERSION }}.nupkg --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json
diff --git a/Svelto.ECS/Svelto.ECS.csproj b/Svelto.ECS/Svelto.ECS.csproj
index ebcf716..f12e4e2 100644
--- a/Svelto.ECS/Svelto.ECS.csproj
+++ b/Svelto.ECS/Svelto.ECS.csproj
@@ -19,7 +19,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\com.sebaslab.svelto.common@3.1.0\Svelto.Common.csproj" />
+    <ProjectReference Include="..\com.sebaslab.svelto.common\Svelto.Common.csproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="System.Memory" Version="4.5.2" />