diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eefc39d5e9a..17e7aa83023 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,6 +1,6 @@ - + diff --git a/eng/Versions.props b/eng/Versions.props index d9c0b2c2036..767047a02f5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,8 +19,8 @@ - true - true + true + true true true true diff --git a/src/Framework/Microsoft.Build.Framework.csproj b/src/Framework/Microsoft.Build.Framework.csproj index 45cb9a34c19..0ca9a27dbb5 100644 --- a/src/Framework/Microsoft.Build.Framework.csproj +++ b/src/Framework/Microsoft.Build.Framework.csproj @@ -217,11 +217,12 @@ EngineServices.Version must be bumped, otherwise engine and task hosts of different versions negotiate incorrectly. Runs only in CI pull-request builds (the AzDO variable SYSTEM_PULLREQUEST_TARGETBRANCH is set) and diffs the file against the PR target branch. This replaces the former Check-RequiredVersionBumps - function in eng/build.ps1 by colocating the check with the file it protects. + function in eng/build.ps1 by colocating the check with the file it protects. Disable inside VMR as git + versions are vastly different therer and might be lacking support. --> + Condition="'$(ContinuousIntegrationBuild)' == 'true' and '$(SYSTEM_PULLREQUEST_TARGETBRANCH)' != '' and '$(DotNetBuildFromVMR)' != 'true'"> <_EngineServicesTargetBranch>refs/remotes/origin/$(SYSTEM_PULLREQUEST_TARGETBRANCH.Replace('refs/heads/', ''))