Version 0.9.3-beta.2

FitConnect/FitConnect.csproj

@@ -6,7 +6,7 @@
         <Nullable>enable</Nullable>
         <AssemblyVersion></AssemblyVersion>
         <FileVersion></FileVersion>
-        <PackageVersion>0.9.0-beta.2</PackageVersion>
+        <PackageVersion>0.9.3-beta.2</PackageVersion>
         <Title>FIT-Connect .NET SDK</Title>
         <Description>Library for sending and receiving submissions via FIT-Connect</Description>
         <Copyright>2022 FIT-Connect contributors</Copyright>

FitConnect/ProjectSpecification.cs

@@ -12,6 +12,8 @@ internal static class ProjectSpecification {
     public const char TokenSeparator = '.';
     public const string CallbackTimestamp = "callback-timestamp";
     public const string CallbackAuthentication = "callback-authentication";
+    public const string PackageVersion = "";
+    public const string CommitId = "";
 
 
     public static byte[] CalculateCallbackHmac(string callbackSecret, long timestamp, string body) {

FitConnect/Services/RestCallService.cs

@@ -55,8 +55,8 @@ internal class RestCallService : IRestCallService {
     }
 
     internal static string GetVersionHeader() {
-        var version = Assembly.GetExecutingAssembly().GetName().Version?.ToString() ?? "";
-        var commit = "aaaaaaa"; // $$_COMMIT_ID_$$ // This line is overwritten by the build script
+        var version = ProjectSpecification.PackageVersion;
+        var commit = ProjectSpecification.CommitId;
         var osVersion = Environment.OSVersion.Platform.ToString() + Environment.OSVersion.Version;
         return $"FITConnectDotNetSDK/{version} (commit:{commit}; os:{osVersion})";
     }

nuget_upload.sh

 #!/bin/zsh
 
-CURRENT=$(git branch | grep \* | cut -d ' ' -f2)
-if [ "$CURRENT" != "main" ]; then
-  echo "Not on main branch"
-  exit 1
-fi
+#CURRENT=$(git branch | grep \* | cut -d ' ' -f2)
+#if [ "$CURRENT" != "main" ]; then
+#  echo "Not on main branch"
+#  exit 1
+#fi
 
 ### Running build script
 if [ -z "$1" ]; then
@@ -17,6 +17,14 @@ FILE_VERSION=$("$1" | sed -r 's|^(([0-9]+).([0-9]+).([0-9]+))(.*)$|\1|')
 sed -i "" -e "s|<AssemblyVersion>.*</AssemblyVersion>|<AssemblyVersion>$FILE_VERSION</AssemblyVersion>|" FitConnect/FitConnect.csproj
 sed -i "" -e "s|<FileVersion>.*</FileVersion>|<FileVersion>$FILE_VERSION</FileVersion>|" FitConnect/FitConnect.csproj
 sed -i "" -e "s|<PackageVersion>.*</PackageVersion>|<PackageVersion>$1</PackageVersion>|" FitConnect/FitConnect.csproj
+sed -i "" -e "s|public const string PackageVersion = \".*\";|public const string PackageVersion = \"$1\";|" FitConnect/ProjectSepcifications.cs
+
+git add . && git commit -m "Version $1" 
+COMMIT_ID=$(git rev-parse --short HEAD)
+
+sed -i "" -s "s|public const string CommitId.*|public const string CommitId = \"$COMMIT_ID\";|" FitConnect/ProjectSepcifications.cs
+git add .
+git commit --amend --no-edit
 
 dotnet clean
 
@@ -32,6 +40,8 @@ fi
 
 cp "FitConnect/bin/Release/FitConnect.$1.nupkg" .
 
-git add . && git commit -m "Version $1" && git tag -a "$1" -m "Version $1" && git push && git push --tags
+exit 200
+
+git tag -a "$1" -m "Version $1" && git push && git push --tags
 dotnet nuget push "FitConnect.$1.nupkg" -k $(cat nuget_api.txt) -s https://api.nuget.org/v3/index.json