Skip to content

Commit d1d013c

Browse files
authored
Fix issue in VC versioning (#291)
1 parent 470fa67 commit d1d013c

File tree

5 files changed

+8
-7
lines changed

5 files changed

+8
-7
lines changed

.pipelines/azure-pipelines-linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ resources:
1616
options: --entrypoint=""
1717

1818
variables:
19-
VcVersion : 1.14.11
19+
VcVersion : 1.14.13
2020
ROOT: $(Build.SourcesDirectory)
2121
CDP_DEFINITION_BUILD_COUNT: $[counter('', 0)] # needed for onebranch.pipeline.version task https://aka.ms/obpipelines/versioning
2222
ENABLE_PRS_DELAYSIGN: 1

.pipelines/azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ pool:
1818
vmImage: windows-latest
1919

2020
variables:
21-
VcVersion : 1.14.12
21+
VcVersion : 1.14.13
2222
ROOT: $(Build.SourcesDirectory)
2323
CDP_DEFINITION_BUILD_COUNT: $[counter('', 0)] # needed for onebranch.pipeline.version task https://aka.ms/obpipelines/versioning
2424
ENABLE_PRS_DELAYSIGN: 1

build.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ else
3131
fi
3232

3333
echo "Building VirtualClient solution."
34-
dotnet build src/VirtualClient/VirtualClient.sln -c Release
34+
dotnet build src/VirtualClient/VirtualClient.sln -c Release -p:VCBuildVersion=$VCBuildVersion
35+
3536

3637
if [ "$BUILD_ALL" = true ]; then
3738
echo "Publishing VirtualClient for all platforms."

src/VirtualClient/Module.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@
172172
higher than the latest production release version as defined in the YAML files
173173
(e.g. /repo/.pipeline) and that is used in the Official builds. For example, if the
174174
major/minor version in the YAML file is set to 1.5.*, then the default version below
175-
should be set to 1.6.0.0. This helps to simplify the debugging experience for developers
175+
should be set to 1.0.0.0. This helps to simplify the debugging experience for developers
176176
who are creating extensions to the Virtual Client by avoiding errors/warnings surfaced by
177177
the Visual Studio debugger around mismatched versions of common .dlls.
178178
@@ -181,7 +181,7 @@
181181
<PropertyGroup>
182182
<PackagePreReleaseSuffix></PackagePreReleaseSuffix>
183183
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
184-
<AssemblyVersion>1.6.0.0</AssemblyVersion>
184+
<AssemblyVersion>1.0.0.0</AssemblyVersion>
185185
<AssemblyVersion Condition="'$(VCBuildVersion)' != ''">$(VCBuildVersion)</AssemblyVersion>
186186
</PropertyGroup>
187187

src/VirtualClient/VERSIONING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ been made. This process is generally followed with most changes to the Virtual C
9090
* **Set the default build version to a major/minor which is higher than the version set in the pipeline YAML files above.
9191
In order to ensure the debugging experience for developers creating extensions for the Virtual Client, the default version
9292
should be set to a higher major/minor version than the one for the Official build. For example, if the Official build version
93-
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
93+
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
9494
version is set in the Module.props for the Virtual Client solution/directory.
9595
9696
<div style="font-size:10pt">
@@ -99,7 +99,7 @@ been made. This process is generally followed with most changes to the Virtual C
9999
<PropertyGroup>
100100
<PackagePreReleaseSuffix></PackagePreReleaseSuffix>
101101
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
102-
<AssemblyVersion>1.6.0.0</AssemblyVersion>
102+
<AssemblyVersion>1.0.0.0</AssemblyVersion>
103103
<AssemblyVersion Condition="'$(VCBuildVersion)' != ''">$(VCBuildVersion)</AssemblyVersion>
104104
</PropertyGroup>
105105
```

0 commit comments

Comments
 (0)