From ca990eaacae7aaab85e20a41fe025aad43bb54c1 Mon Sep 17 00:00:00 2001 From: Jenny Ferries Date: Sat, 10 Aug 2024 18:08:18 -0700 Subject: [PATCH 1/5] updates for one build --- Wilson.sln | 1 - build/common.props | 14 +++++++------- build/version.props | 27 ++++++++++++++++----------- 3 files changed, 23 insertions(+), 19 deletions(-) diff --git a/Wilson.sln b/Wilson.sln index 18274278e0..65380355fa 100644 --- a/Wilson.sln +++ b/Wilson.sln @@ -105,7 +105,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{BC99A01F build\dependenciesTest.props = build\dependenciesTest.props build\targets.props = build\targets.props build\targetsTest.props = build\targetsTest.props - build\version.props = build\version.props EndProjectSection EndProject Global diff --git a/build/common.props b/build/common.props index 3c9d249dfb..c5ef20540f 100644 --- a/build/common.props +++ b/build/common.props @@ -33,17 +33,17 @@ - 8.0.0 + 8.0.1 preview-$([System.DateTime]::Now.AddYears(-2019).Year)$([System.DateTime]::Now.ToString("MMddHHmmss")) preview-$([System.DateTime]::Now.AddYears(-2019).Year)$([System.DateTime]::Now.ToString("MMddHH")) - $(WilsonVersion.Contains("-")) - $(WilsonVersion) - $(PreviewVersionSuffix) - $(WilsonCurrentVersion) - $(WilsonVersion).$([System.DateTime]::Now.AddYears(-2019).Year)$([System.DateTime]::Now.ToString("MMdd")) - $(WilsonCurrentVersion).$([System.DateTime]::Now.AddYears(-2019).Year)$([System.DateTime]::Now.ToString("MMdd")) + $(MicrosoftIdentityModelVersion.Contains("-")) + $(MicrosoftIdentityModelVersion) + $(PreviewVersionSuffix) + $(MicrosoftIdentityModelCurrentVersion) + $(MicrosoftIdentityModelVersion).$([System.DateTime]::Now.AddYears(-2019).Year)$([System.DateTime]::Now.ToString("MMdd")) + $(MicrosoftIdentityModelCurrentVersion).$([System.DateTime]::Now.AddYears(-2019).Year)$([System.DateTime]::Now.ToString("MMdd")) diff --git a/build/version.props b/build/version.props index 6ab18636f9..aed3984167 100644 --- a/build/version.props +++ b/build/version.props @@ -1,17 +1,22 @@ - - 0.0.1 - preview - + + 8.0.1 + + - - - $(VersionPrefix) - + + + + $(MicrosoftIdentityModelVersion) + From dababf2b2d1e5445c0865a08053e6cf5d416ecdd Mon Sep 17 00:00:00 2001 From: jennyf19 Date: Thu, 15 Aug 2024 17:28:42 -0700 Subject: [PATCH 2/5] Delete build/version.props --- build/version.props | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 build/version.props diff --git a/build/version.props b/build/version.props deleted file mode 100644 index aed3984167..0000000000 --- a/build/version.props +++ /dev/null @@ -1,22 +0,0 @@ - - - - 8.0.1 - - - - - - - $(MicrosoftIdentityModelVersion) - - - From cbcf84570cdceda9a1f5e2ec15401322b3057284 Mon Sep 17 00:00:00 2001 From: Jean-Marc Prieur Date: Thu, 15 Aug 2024 19:12:34 -0700 Subject: [PATCH 3/5] Move the version to version.projs a it's also included by tests (#2784) --- build/common.props | 15 +-------------- build/version.props | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 14 deletions(-) create mode 100644 build/version.props diff --git a/build/common.props b/build/common.props index c5ef20540f..f3153ae6ec 100644 --- a/build/common.props +++ b/build/common.props @@ -2,6 +2,7 @@ + $(MSBuildThisFileDirectory)35MSSharedLib1024.snk @@ -31,20 +32,6 @@ true - - - 8.0.1 - - preview-$([System.DateTime]::Now.AddYears(-2019).Year)$([System.DateTime]::Now.ToString("MMddHHmmss")) - - preview-$([System.DateTime]::Now.AddYears(-2019).Year)$([System.DateTime]::Now.ToString("MMddHH")) - $(MicrosoftIdentityModelVersion.Contains("-")) - $(MicrosoftIdentityModelVersion) - $(PreviewVersionSuffix) - $(MicrosoftIdentityModelCurrentVersion) - $(MicrosoftIdentityModelVersion).$([System.DateTime]::Now.AddYears(-2019).Year)$([System.DateTime]::Now.ToString("MMdd")) - $(MicrosoftIdentityModelCurrentVersion).$([System.DateTime]::Now.AddYears(-2019).Year)$([System.DateTime]::Now.ToString("MMdd")) - false diff --git a/build/version.props b/build/version.props new file mode 100644 index 0000000000..b1584b52e5 --- /dev/null +++ b/build/version.props @@ -0,0 +1,17 @@ + + + + + 8.0.1 + + preview-$([System.DateTime]::Now.AddYears(-2019).Year)$([System.DateTime]::Now.ToString("MMddHHmmss")) + + preview-$([System.DateTime]::Now.AddYears(-2019).Year)$([System.DateTime]::Now.ToString("MMddHH")) + $(MicrosoftIdentityModelVersion.Contains("-")) + $(MicrosoftIdentityModelVersion) + $(PreviewVersionSuffix) + $(MicrosoftIdentityModelCurrentVersion) + $(MicrosoftIdentityModelVersion).$([System.DateTime]::Now.AddYears(-2019).Year)$([System.DateTime]::Now.ToString("MMdd")) + $(MicrosoftIdentityModelCurrentVersion).$([System.DateTime]::Now.AddYears(-2019).Year)$([System.DateTime]::Now.ToString("MMdd")) + + \ No newline at end of file From 91827efa114ff7b1f68531f62449f5c1cb661baf Mon Sep 17 00:00:00 2001 From: Jenny Ferries Date: Mon, 19 Aug 2024 09:31:03 -0700 Subject: [PATCH 4/5] update other ymls to use MicrosoftIdentityModelVersion --- build/releaseBuild.yml | 4 ++-- build/template-Build-run-tests-sign.yml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/releaseBuild.yml b/build/releaseBuild.yml index 2e66a454e2..0436b1b7be 100644 --- a/build/releaseBuild.yml +++ b/build/releaseBuild.yml @@ -13,7 +13,7 @@ schedules: # The following variables are set in the release build UI: # BuildConfiguration: 'debug|release' - # WilsonVersion: ''. Full version number + # MicrosoftIdentityModelVersion: ''. Full version number # BuildPlatform: 'any cpu' jobs: @@ -28,4 +28,4 @@ jobs: steps: - - template: template-Build-run-tests-sign.yml \ No newline at end of file + - template: template-Build-run-tests-sign.yml diff --git a/build/template-Build-run-tests-sign.yml b/build/template-Build-run-tests-sign.yml index 039ec07aea..5771176096 100644 --- a/build/template-Build-run-tests-sign.yml +++ b/build/template-Build-run-tests-sign.yml @@ -4,8 +4,8 @@ steps: - script: echo $(BuildConfiguration) displayName: 'display Build Configuration' -- script: echo $(WilsonVersion) - displayName: 'display WilsonVersion' +- script: echo $(MicrosoftIdentityModelVersion) + displayName: 'display MicrosoftIdentityModelVersion' - task: UseDotNet@2 displayName: 'Use .NET Core sdk 2.x' @@ -187,7 +187,7 @@ steps: - task: NuGetCommand@2 displayName: 'Upload NuGet Package to VSTS NuGet' - condition: eq(variables['WilsonVersion'], '') + condition: eq(variables['MicrosoftIdentityModelVersion'], '') inputs: command: push packagesToPush: '$(Build.Repository.LocalPath)\artifacts\*.nupkg' From 3b22046c6d2a7505efe9df58132603be7c34eaff Mon Sep 17 00:00:00 2001 From: Jean-Marc Prieur Date: Mon, 19 Aug 2024 10:52:50 -0700 Subject: [PATCH 5/5] Re-adding version.props to the solution --- Wilson.sln | 1 + 1 file changed, 1 insertion(+) diff --git a/Wilson.sln b/Wilson.sln index 65380355fa..18274278e0 100644 --- a/Wilson.sln +++ b/Wilson.sln @@ -105,6 +105,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{BC99A01F build\dependenciesTest.props = build\dependenciesTest.props build\targets.props = build\targets.props build\targetsTest.props = build\targetsTest.props + build\version.props = build\version.props EndProjectSection EndProject Global