Fix rider package generation

Abc-Arbitrage · Dec 9, 2022 · 7e3f576 · 7e3f576
1 parent 7061d1b
commit 7e3f576
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/Abc.MoqComplete/Deployment/build_rider_plugin.ps1 b/Abc.MoqComplete/Deployment/build_rider_plugin.ps1
@@ -1,11 +1,16 @@
 $artifactDirectory = $args[0]
 $PluginId = "Abc.MoqComplete"
 $BuildPropsFilePath = "Abc.MoqComplete\Directory.Build.props"
+$PluginPropsFilePath = "Abc.MoqComplete\Plugin.props"
 
 # Get the version number
 if (Test-Path $BuildPropsFilePath) {
-	$PluginXml = [xml] (Get-Content $BuildPropsFilePath)
-	$Version = $PluginXml.SelectSingleNode(".//Project/PropertyGroup/Version").innerText
+	$BuildPropsXml = [xml] (Get-Content $BuildPropsFilePath)
+	$PluginPropsXml = [xml] (Get-Content $PluginPropsFilePath)
+	$Version = $BuildPropsXml.SelectSingleNode(".//Project/PropertyGroup/Version").innerText
+	$SdkVersion = $PluginPropsXml.SelectSingleNode(".//Project/PropertyGroup/SdkVersion").innerText
+	Write-Host "Version is $Version SdkVersion is $SdkVersion"
+	$Version = $Version.Replace("`$(SdkVersion)", $SdkVersion)
 }
 
 Write-Host "Generating Rider package"

diff --git a/Abc.MoqComplete/Directory.Build.props b/Abc.MoqComplete/Directory.Build.props
@@ -24,7 +24,7 @@
 
   <PropertyGroup>
     <!-- The version of the MoqComplete plugin -->
-    <Version>$(SdkVersion).1</Version>
+    <Version>$(SdkVersion).0</Version>
   </PropertyGroup>
 
 </Project>