From fa4cc24686024dc944c711a5d7ffcd49bf60c0df Mon Sep 17 00:00:00 2001
From: Patrick Hallisey <pahallis@microsoft.com>
Date: Tue, 4 Jun 2024 13:16:18 -0700
Subject: [PATCH] Fix version properties to allow for dynamic alpha versions

---
 .github/workflows/main.yml    | 7 +------
 .github/workflows/release.yml | 7 +------
 src/OpenAI.csproj             | 3 ++-
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 521ae259..d04ded75 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -24,9 +24,8 @@ jobs:
 
       - name: Build
         run: dotnet build
-          -c Release
+          --configuration Release
           ${{ env.version_suffix_args }}
-        working-directory: .dotnet
 
       - name: Test
         run: dotnet test
@@ -36,7 +35,6 @@ jobs:
           --logger "trx;LogFileName=${{github.workspace}}/artifacts/test-results/full.trx"
         env:
           SECRET_VALUE: ${{ secrets.OPENAI_TOKEN }}
-        working-directory: .dotnet
 
       - name: Pack
         run: dotnet pack
@@ -44,7 +42,6 @@ jobs:
           --configuration Release
           --output "${{github.workspace}}/artifacts/packages"
           ${{ env.version_suffix_args }}
-        working-directory: .dotnet
 
       - name: Upload artifact
         uses: actions/upload-artifact@v2
@@ -60,7 +57,6 @@ jobs:
           --username ${{ github.actor }}
           --password ${{ secrets.GITHUB_TOKEN }}
           --store-password-in-clear-text
-        working-directory: .dotnet
 
       - name: Publish
         if: github.event_name != 'pull_request'
@@ -69,4 +65,3 @@ jobs:
           --source "github"
           --api-key ${{ secrets.GITHUB_TOKEN }}
           --skip-duplicate
-        working-directory: .dotnet
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 678273f5..9bca4e1e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -4,7 +4,6 @@ on:
   release:
     types: [published]
 
-
 jobs:
   deploy:
     runs-on: ubuntu-latest
@@ -19,8 +18,7 @@ jobs:
 
       - name: Build
         run: dotnet build
-          -c Release
-        working-directory: .dotnet
+          --configuration Release
 
       - name: Test
         run: dotnet test
@@ -30,7 +28,6 @@ jobs:
           --logger "trx;LogFileName=${{github.workspace}}/artifacts/test-results/full.trx"
         env:
           SECRET_VALUE: ${{ secrets.OPENAI_TOKEN }}
-        working-directory: .dotnet
 
       # Pack the client nuget package and include urls back to the repository and release tag
       - name: Pack
@@ -40,7 +37,6 @@ jobs:
           --output "${{github.workspace}}/artifacts/packages"
           /p:RepositoryUrl="${{ github.repository }}"
           /p:PackageProjectUrl="${{ github.repository }}/tree/${{ github.event.release.tag_name }}"
-        working-directory: .dotnet
 
       # Append the nuget package to the github release that triggered this workflow
       - name: Upload release asset
@@ -62,7 +58,6 @@ jobs:
           --username ${{ github.actor }}
           --password ${{ secrets.GITHUB_TOKEN }}
           --store-password-in-clear-text
-        working-directory: .dotnet
 
       # - name: Publish
       #   run: dotnet nuget push
diff --git a/src/OpenAI.csproj b/src/OpenAI.csproj
index d995dc2d..a2d1210f 100644
--- a/src/OpenAI.csproj
+++ b/src/OpenAI.csproj
@@ -2,7 +2,8 @@
   <PropertyGroup>
     <Description>This is the OpenAI client library for developing .NET applications with rich experience.</Description>
     <AssemblyTitle>SDK Code Generation OpenAI</AssemblyTitle>
-    <Version>2.0.0-beta.1</Version>
+    <VersionPrefix>2.0.0</VersionPrefix>
+    <VersionSuffix>beta.1</VersionSuffix>
     <PackageTags>OpenAI</PackageTags>
     <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
     <LangVersion>latest</LangVersion>