Skip to content

updates for one build #2777

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 19, 2024
Merged

updates for one build #2777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ca990ea
updates for one build
jennyf19 Aug 11, 2024
dababf2
Delete build/version.props
jennyf19 Aug 16, 2024
cbcf845
Move the version to version.projs a it's also included by tests (#2784)
jmprieur Aug 16, 2024
91827ef
update other ymls to use MicrosoftIdentityModelVersion
jennyf19 Aug 19, 2024
3b22046
Re-adding version.props to the solution
jmprieur Aug 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 1 addition & 14 deletions build/common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

<Import Project="dependencies.props" />
<Import Project="targets.props" />
<Import Project="version.props" />

<PropertyGroup>
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)35MSSharedLib1024.snk</AssemblyOriginatorKeyFile>
Expand Down Expand Up @@ -31,20 +32,6 @@
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
</PropertyGroup>

<!-- Wilson version -->
<PropertyGroup>
<WilsonCurrentVersion>8.0.0</WilsonCurrentVersion>

<PreviewVersionSuffix Condition="'$(PreviewVersionSuffix)' == '' and '$(BuildingInsideVisualStudio)' != 'true'">preview-$([System.DateTime]::Now.AddYears(-2019).Year)$([System.DateTime]::Now.ToString("MMddHHmmss"))</PreviewVersionSuffix>
<!--VS re-evaluates the variables, so having seconds or minutes creates an infinite loop of package updates-->
<PreviewVersionSuffix Condition="'$(PreviewVersionSuffix)' == '' and '$(BuildingInsideVisualStudio)' == 'true'">preview-$([System.DateTime]::Now.AddYears(-2019).Year)$([System.DateTime]::Now.ToString("MMddHH"))</PreviewVersionSuffix>
<IsCustomPreview>$(WilsonVersion.Contains("-"))</IsCustomPreview>
<Version Condition="'$(WilsonVersion)' != ''">$(WilsonVersion)</Version>
<VersionSuffix Condition="'$(WilsonVersion)' == ''">$(PreviewVersionSuffix)</VersionSuffix>
<VersionPrefix Condition="'$(WilsonVersion)' == ''">$(WilsonCurrentVersion)</VersionPrefix>
<FileVersion Condition="'$(WilsonVersion)' != '' and '$(IsCustomPreview)' != 'true' ">$(WilsonVersion).$([System.DateTime]::Now.AddYears(-2019).Year)$([System.DateTime]::Now.ToString("MMdd"))</FileVersion>
<FileVersion Condition="'$(WilsonVersion)' == ''">$(WilsonCurrentVersion).$([System.DateTime]::Now.AddYears(-2019).Year)$([System.DateTime]::Now.ToString("MMdd"))</FileVersion>
</PropertyGroup>

<PropertyGroup>
<EnablePackageValidation>false</EnablePackageValidation>
Expand Down
4 changes: 2 additions & 2 deletions build/releaseBuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -28,4 +28,4 @@ jobs:

steps:

- template: template-Build-run-tests-sign.yml
- template: template-Build-run-tests-sign.yml
6 changes: 3 additions & 3 deletions build/template-Build-run-tests-sign.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand Down
28 changes: 14 additions & 14 deletions build/version.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<!-- This file may be overwritten by automation. Only values allowed here are VersionPrefix and VersionSuffix. -->
<Project>
<PropertyGroup>
<VersionPrefix>0.0.1</VersionPrefix>
<VersionSuffix>preview</VersionSuffix>
</PropertyGroup>
<!-- Wilson version -->
<PropertyGroup>
<MicrosoftIdentityModelCurrentVersion>8.0.1</MicrosoftIdentityModelCurrentVersion>

<!--Enables to create preview NuGet packages.-->
<PropertyGroup Condition=" '$(VersionSuffix)' == '' ">
<Version>$(VersionPrefix)</Version>
</PropertyGroup>

<PropertyGroup Condition=" '$(VersionSuffix)' != '' ">
<Version>$(VersionPrefix)-$(VersionSuffix)</Version>
</PropertyGroup>

</Project>
<PreviewVersionSuffix Condition="'$(PreviewVersionSuffix)' == '' and '$(BuildingInsideVisualStudio)' != 'true'">preview-$([System.DateTime]::Now.AddYears(-2019).Year)$([System.DateTime]::Now.ToString("MMddHHmmss"))</PreviewVersionSuffix>
<!--VS re-evaluates the variables, so having seconds or minutes creates an infinite loop of package updates-->
<PreviewVersionSuffix Condition="'$(PreviewVersionSuffix)' == '' and '$(BuildingInsideVisualStudio)' == 'true'">preview-$([System.DateTime]::Now.AddYears(-2019).Year)$([System.DateTime]::Now.ToString("MMddHH"))</PreviewVersionSuffix>
<IsCustomPreview>$(MicrosoftIdentityModelVersion.Contains("-"))</IsCustomPreview>
<Version Condition="'$(MicrosoftIdentityModelVersion)' != ''">$(MicrosoftIdentityModelVersion)</Version>
<VersionSuffix Condition="'$(MicrosoftIdentityModelVersion)' == ''">$(PreviewVersionSuffix)</VersionSuffix>
<VersionPrefix Condition="'$(MicrosoftIdentityModelVersion)' == ''">$(MicrosoftIdentityModelCurrentVersion)</VersionPrefix>
<FileVersion Condition="'$(MicrosoftIdentityModelVersion)' != '' and '$(IsCustomPreview)' != 'true' ">$(MicrosoftIdentityModelVersion).$([System.DateTime]::Now.AddYears(-2019).Year)$([System.DateTime]::Now.ToString("MMdd"))</FileVersion>
<FileVersion Condition="'$(MicrosoftIdentityModelVersion)' == ''">$(MicrosoftIdentityModelCurrentVersion).$([System.DateTime]::Now.AddYears(-2019).Year)$([System.DateTime]::Now.ToString("MMdd"))</FileVersion>
</PropertyGroup>
</Project>
Loading