Fix issue in VC versioning (#291)

microsoft · Apr 4, 2024 · d1d013c · d1d013c
1 parent 470fa67
commit d1d013c
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/.pipelines/azure-pipelines-linux.yml b/.pipelines/azure-pipelines-linux.yml
@@ -16,7 +16,7 @@ resources:
     options: --entrypoint=""
 
 variables:
-  VcVersion : 1.14.11
+  VcVersion : 1.14.13
   ROOT: $(Build.SourcesDirectory)
   CDP_DEFINITION_BUILD_COUNT: $[counter('', 0)] # needed for onebranch.pipeline.version task https://aka.ms/obpipelines/versioning
   ENABLE_PRS_DELAYSIGN: 1

diff --git a/.pipelines/azure-pipelines.yml b/.pipelines/azure-pipelines.yml
@@ -18,7 +18,7 @@ pool:
   vmImage: windows-latest
 
 variables:
-  VcVersion : 1.14.12
+  VcVersion : 1.14.13
   ROOT: $(Build.SourcesDirectory)
   CDP_DEFINITION_BUILD_COUNT: $[counter('', 0)] # needed for onebranch.pipeline.version task https://aka.ms/obpipelines/versioning
   ENABLE_PRS_DELAYSIGN: 1

diff --git a/build.sh b/build.sh
@@ -31,7 +31,8 @@ else
 fi
 
 echo "Building VirtualClient solution."
-dotnet build src/VirtualClient/VirtualClient.sln -c Release
+dotnet build src/VirtualClient/VirtualClient.sln -c Release -p:VCBuildVersion=$VCBuildVersion
+
 
 if [ "$BUILD_ALL" = true ]; then
     echo "Publishing VirtualClient for all platforms."

diff --git a/src/VirtualClient/Module.props b/src/VirtualClient/Module.props
@@ -172,7 +172,7 @@
     higher than the latest production release version as defined in the YAML files
     (e.g. /repo/.pipeline) and that is used in the Official builds. For example, if the
     major/minor version in the YAML file is set to 1.5.*, then the default version below
-    should be set to 1.6.0.0. This helps to simplify the debugging experience for developers
+    should be set to 1.0.0.0. This helps to simplify the debugging experience for developers
     who are creating extensions to the Virtual Client by avoiding errors/warnings surfaced by
     the Visual Studio debugger around mismatched versions of common .dlls.
     
@@ -181,7 +181,7 @@
     <PropertyGroup>
         <PackagePreReleaseSuffix></PackagePreReleaseSuffix>
         <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-        <AssemblyVersion>1.6.0.0</AssemblyVersion>
+        <AssemblyVersion>1.0.0.0</AssemblyVersion>
         <AssemblyVersion Condition="'$(VCBuildVersion)' != ''">$(VCBuildVersion)</AssemblyVersion>
     </PropertyGroup>
 

diff --git a/src/VirtualClient/VERSIONING.md b/src/VirtualClient/VERSIONING.md
@@ -90,7 +90,7 @@ been made. This process is generally followed with most changes to the Virtual C
 * **Set the default build version to a major/minor which is higher than the version set in the pipeline YAML files above.
   In order to ensure the debugging experience for developers creating extensions for the Virtual Client, the default version
   should be set to a higher major/minor version than the one for the Official build. For example, if the Official build version
-  in the YAML is set to a major/minor of 1.5.*, then the default version for the Virtual Client should be set to 1.6.*. The default
+  in the YAML is set to a major/minor of 1.5.*, then the default version for the Virtual Client should be set to 1.0.*. The default
   version is set in the Module.props for the Virtual Client solution/directory.
 
   <div style="font-size:10pt">
@@ -99,7 +99,7 @@ been made. This process is generally followed with most changes to the Virtual C
   <PropertyGroup>
       <PackagePreReleaseSuffix></PackagePreReleaseSuffix>
       <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-      <AssemblyVersion>1.6.0.0</AssemblyVersion>
+      <AssemblyVersion>1.0.0.0</AssemblyVersion>
       <AssemblyVersion Condition="'$(VCBuildVersion)' != ''">$(VCBuildVersion)</AssemblyVersion>
   </PropertyGroup>
   ```