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 1 commit
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
1 change: 0 additions & 1 deletion Wilson.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions build/common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,17 @@

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

<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>
<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>

<PropertyGroup>
Expand Down
27 changes: 16 additions & 11 deletions build/version.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,22 @@
<!-- 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>
<PropertyGroup>
<MicrosoftIdentityModelVersion Condition=" '$(MicrosoftIdentityModelVersion)' == '' ">8.0.1</MicrosoftIdentityModelVersion>
<!--<VersionPrefix>0.0.1</VersionPrefix>
<VersionSuffix>preview</VersionSuffix>-->
</PropertyGroup>

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

<PropertyGroup>
<Version>$(MicrosoftIdentityModelVersion)</Version>
</PropertyGroup>

</Project>