Replace AssemblyVersion with Version

.github/workflows/dotnetcore.yml

@@ -30,16 +30,9 @@ jobs:
       with:
         dotnet-version: 8.0.x
 
-    - name: update versions
-      run: .\updateAssemblyInfo.ps1
-
-    # Build and test
-    - name: Restore packages
-      run: dotnet restore Wilson.sln
-
     - name: Run the tests
       run: dotnet test Wilson.sln
 
     # Run baseline package validation
     - name: Pack
-      run: .\pack.ps1
+      run: dotnet pack --no-restore --no-build

Product.proj

@@ -0,0 +1,21 @@
+<Project DefaultTargets="Build">
+  <PropertyGroup>
+    <PreviewVersionSuffix Condition="'$(PreviewVersionSuffix)' == ''">preview-$([System.DateTime]::Now.AddYears(-2019).Year)$([System.DateTime]::Now.ToString("MMddHHmmss"))</PreviewVersionSuffix>
+  </PropertyGroup>
+
+  <Target Name="Build">
+    <MSBuild Projects="Wilson.sln" Targets="Build" Properties="PreviewVersionSuffix=$(PreviewVersionSuffix)" />
+  </Target>
+  <Target Name="restore">
+    <MSBuild Projects="Wilson.sln" Targets="restore" Properties="PreviewVersionSuffix=$(PreviewVersionSuffix)" />
+  </Target>
+  <Target Name="clean">
+    <MSBuild Projects="Wilson.sln" Targets="clean" Properties="PreviewVersionSuffix=$(PreviewVersionSuffix)" />
+  </Target>
+  <Target Name="pack">
+    <MSBuild Projects="Wilson.sln" Targets="pack" Properties="PreviewVersionSuffix=$(PreviewVersionSuffix)" />
+  </Target>
+  <Target Name="VSTest">
+    <MSBuild Projects="Wilson.sln" Targets="VSTest" Properties="PreviewVersionSuffix=$(PreviewVersionSuffix)" />
+  </Target>
+</Project>

build/common.props

@@ -2,17 +2,13 @@
 
   <Import Project="dependencies.props" />
   <Import Project="targets.props" />
-  <Import Project="version.props" />
 
   <PropertyGroup>
     <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)35MSSharedLib1024.snk</AssemblyOriginatorKeyFile>
     <Authors>Microsoft</Authors>
     <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
     <Company>Microsoft Corporation.</Company>
     <DelaySign>true</DelaySign>
-    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
-    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
-    <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
     <OutputTypeEx>library</OutputTypeEx>
     <Product>Microsoft IdentityModel</Product>
     <RepositoryType>git</RepositoryType>
@@ -34,6 +30,21 @@
     <LangVersion>12</LangVersion>
   </PropertyGroup>
 
+  <!-- Wilson version  -->
+  <PropertyGroup>
+    <WilsonCurrentVersion>7.3.2</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>true</EnablePackageValidation>
     <PackageValidationBaselineVersion>7.0.0</PackageValidationBaselineVersion>

build/releaseBuild.yml

@@ -15,8 +15,10 @@ variables:
   - group: Middleware
   - name: BuildPlatform
     value: 'any cpu'
-  - name: BuildConfiguration
-    value: 'release'
+
+    # The following variables are set in the release build UI:
+    # BuildConfiguration: 'debug|release'
+    # WilsonVersion: ''. Full version number
 
 jobs:
 - job: build
@@ -29,6 +31,12 @@ jobs:
   timeoutInMinutes: 360
 
   steps:
+  - script: echo $(BuildConfiguration)
+    displayName: 'display Build Configuration'
+
+  - script: echo $(WilsonVersion)
+    displayName: 'display WilsonVersion'
+
   - task: UseDotNet@2
     displayName: 'Use .NET Core sdk 2.x'
     inputs:
@@ -63,19 +71,11 @@ jobs:
       regedit /s .\build\strongNameBypass.reg
     displayName: 'Strong Name Bypass'
 
-  - task: PowerShell@2
-    displayName: 'Update Assembly Info'
-    inputs:
-      targetType: filePath
-      filePath: ./updateAssemblyInfo.ps1
-      arguments: '-packageType $(BuildConfiguration)'
-
   - task: DotNetCoreCLI@2
     displayName: Build
     inputs:
-      command: 'custom'
-      projects: 'wilson.sln'
-      custom: 'msbuild'
+      command: 'build'
+      projects: 'Product.proj'
       arguments: '/r:True /p:Configuration=$(BuildConfiguration) /p:Platform="Any CPU" /verbosity:m /p:SourceLinkCreate=true'
 
   - task: PowerShell@2
@@ -135,12 +135,19 @@ jobs:
   #Sign Wilson 7x task group
   - template: template-sign-wilson.yaml
 
-  - task: PowerShell@2
-    displayName: Pack
-    inputs:
-      targetType: filePath
-      filePath: ./pack.ps1
-      arguments: '-buildType $(BuildConfiguration) C:\hostedtoolcache\windows\dotnet'
+  - task: DotNetCoreCLI@2
+    displayName: 'Pack libraries'
+    inputs:
+      command: 'pack'
+      arguments: '--no-restore'
+      packDirectory: '$(Build.SourcesDirectory)\artifacts'
+      nobuild: true
+      verbosityPack: 'Minimal'
+      configuration: $(BuildConfiguration)
+      packagesToPack: 'Product.proj'
+      feedsToUse: 'config'
+      nugetConfigPath: Nuget.config
+      externalFeedCredentials: 'Internal Analyzers'
 
   - task: EsrpCodeSigning@4
     displayName: 'Sign Nuget Packages'
@@ -190,7 +197,7 @@ jobs:
     continueOnError: true
 
   - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
-    displayName: 'Manifest Generator '
+    displayName: 'Manifest Generator'
     inputs:
       BuildDropPath: '$(Build.SourcesDirectory)\src'
       ManifestDirPath: '$(Build.SourcesDirectory)\artifacts'

buildConfiguration.xml

@@ -2,8 +2,6 @@
   <dotnetArchitecture>x64</dotnetArchitecture>
   <nugetVersion>3.5.0-rc-1285</nugetVersion>
   <runtimes>net461,netstandard2.0</runtimes>
-  <assemblyVersion>7.3.2</assemblyVersion>
-  <nugetSuffix>preview</nugetSuffix>
   <projects>
     <src>
       <project name="Microsoft.IdentityModel.Logging" />

buildTestPack.bat

@@ -0,0 +1,3 @@
+dotnet build /r Product.proj
+dotnet test --no-restore --no-build Product.proj
+dotnet pack --no-restore --no-build Product.proj

src/Microsoft.IdentityModel.Abstractions/Properties/AssemblyInfo.cs

@@ -5,9 +5,6 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-[assembly: AssemblyInformationalVersion("0.0.1")]
-[assembly: AssemblyFileVersion("0.0.1")]
 [assembly: AssemblyMetadata("Serviceable", "True")]
-[assembly: AssemblyVersion("0.0.1")]
 [assembly: CLSCompliant(true)]
 [assembly: ComVisible(false)]

src/Microsoft.IdentityModel.JsonWebTokens/Properties/AssemblyInfo.cs

@@ -6,10 +6,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-[assembly: AssemblyInformationalVersion("0.0.1")]
-[assembly: AssemblyFileVersion("0.0.1")]
 [assembly: AssemblyMetadata("Serviceable", "True")]
-[assembly: AssemblyVersion("0.0.1")]
 [assembly: CLSCompliant(true)]
 [assembly: ComVisible(false)]
 

src/Microsoft.IdentityModel.KeyVaultExtensions/Properties/AssemblyInfo.cs

@@ -5,9 +5,6 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-[assembly: AssemblyInformationalVersion("0.0.1")]
-[assembly: AssemblyFileVersion("0.0.1")]
 [assembly: AssemblyMetadata("Serviceable", "True")]
-[assembly: AssemblyVersion("0.0.1")]
 [assembly: CLSCompliant(true)]
 [assembly: ComVisible(false)]

src/Microsoft.IdentityModel.Logging/Properties/AssemblyInfo.cs

@@ -6,10 +6,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-[assembly: AssemblyInformationalVersion("0.0.1")]
-[assembly: AssemblyFileVersion("0.0.1")]
 [assembly: AssemblyMetadata("Serviceable", "True")]
-[assembly: AssemblyVersion("0.0.1")]
 [assembly: CLSCompliant(true)]
 [assembly: ComVisible(false)]
 

src/Microsoft.IdentityModel.LoggingExtensions/Properties/AssemblyInfo.cs

@@ -5,9 +5,6 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-[assembly: AssemblyInformationalVersion("0.0.1")]
-[assembly: AssemblyFileVersion("0.0.1")]
 [assembly: AssemblyMetadata("Serviceable", "True")]
-[assembly: AssemblyVersion("0.0.1")]
 [assembly: CLSCompliant(true)]
 [assembly: ComVisible(false)]

src/Microsoft.IdentityModel.ManagedKeyVaultSecurityKey/Properties/AssemblyInfo.cs

@@ -5,9 +5,6 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-[assembly: AssemblyInformationalVersion("0.0.1")]
-[assembly: AssemblyFileVersion("0.0.1")]
 [assembly: AssemblyMetadata("Serviceable", "True")]
-[assembly: AssemblyVersion("0.0.1")]
 [assembly: CLSCompliant(true)]
 [assembly: ComVisible(false)]

src/Microsoft.IdentityModel.Protocols.OpenIdConnect/Properties/AssemblyInfo.cs

@@ -5,9 +5,6 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-[assembly: AssemblyInformationalVersion("0.0.1")]
-[assembly: AssemblyFileVersion("0.0.1")]
 [assembly: AssemblyMetadata("Serviceable", "True")]
-[assembly: AssemblyVersion("0.0.1")]
 [assembly: CLSCompliant(true)]
 [assembly: ComVisible(false)]

src/Microsoft.IdentityModel.Protocols.SignedHttpRequest/Properties/AssemblyInfo.cs

@@ -6,10 +6,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-[assembly: AssemblyInformationalVersion("0.0.1")]
-[assembly: AssemblyFileVersion("0.0.1")]
 [assembly: AssemblyMetadata("Serviceable", "True")]
-[assembly: AssemblyVersion("0.0.1")]
 [assembly: CLSCompliant(true)]
 [assembly: ComVisible(false)]
 

src/Microsoft.IdentityModel.Protocols.WsFederation/Properties/AssemblyInfo.cs

@@ -6,10 +6,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-[assembly: AssemblyInformationalVersion("0.0.1")]
-[assembly: AssemblyFileVersion("0.0.1")]
 [assembly: AssemblyMetadata("Serviceable", "True")]
-[assembly: AssemblyVersion("0.0.1")]
 [assembly: CLSCompliant(true)]
 [assembly: ComVisible(false)]
 

src/Microsoft.IdentityModel.Protocols/Properties/AssemblyInfo.cs

@@ -6,10 +6,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-[assembly: AssemblyInformationalVersion("0.0.1")]
-[assembly: AssemblyFileVersion("0.0.1")]
 [assembly: AssemblyMetadata("Serviceable", "True")]
-[assembly: AssemblyVersion("0.0.1")]
 [assembly: CLSCompliant(true)]
 [assembly: ComVisible(false)]
 

src/Microsoft.IdentityModel.TestExtensions/Properties/AssemblyInfo.cs

@@ -5,9 +5,6 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-[assembly: AssemblyInformationalVersion("0.0.1")]
-[assembly: AssemblyFileVersion("0.0.1")]
 [assembly: AssemblyMetadata("Serviceable", "True")]
-[assembly: AssemblyVersion("0.0.1")]
 [assembly: CLSCompliant(true)]
 [assembly: ComVisible(false)]

src/Microsoft.IdentityModel.Tokens.Saml/Properties/AssemblyInfo.cs

@@ -6,11 +6,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-
-[assembly: AssemblyInformationalVersion("0.0.1")]
-[assembly: AssemblyFileVersion("0.0.1")]
 [assembly: AssemblyMetadata("Serviceable", "True")]
-[assembly: AssemblyVersion("0.0.1")]
 [assembly: CLSCompliant(true)]
 [assembly: ComVisible(false)]
 

src/Microsoft.IdentityModel.Tokens/Properties/AssemblyInfo.cs

@@ -6,10 +6,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-[assembly: AssemblyInformationalVersion("0.0.1")]
-[assembly: AssemblyFileVersion("0.0.1")]
 [assembly: AssemblyMetadata("Serviceable", "True")]
-[assembly: AssemblyVersion("0.0.1")]
 [assembly: CLSCompliant(true)]
 [assembly: ComVisible(false)]
 

src/Microsoft.IdentityModel.Validators/Properties/AssemblyInfo.cs

@@ -6,10 +6,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-[assembly: AssemblyInformationalVersion("0.0.1")]
-[assembly: AssemblyFileVersion("0.0.1")]
 [assembly: AssemblyMetadata("Serviceable", "True")]
-[assembly: AssemblyVersion("0.0.1")]
 [assembly: CLSCompliant(true)]
 [assembly: ComVisible(false)]
 

src/Microsoft.IdentityModel.Xml/Properties/AssemblyInfo.cs

@@ -6,10 +6,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-[assembly: AssemblyInformationalVersion("0.0.1")]
-[assembly: AssemblyFileVersion("0.0.1")]
 [assembly: AssemblyMetadata("Serviceable", "True")]
-[assembly: AssemblyVersion("0.0.1")]
 [assembly: CLSCompliant(true)]
 [assembly: ComVisible(false)]
 

src/System.IdentityModel.Tokens.Jwt/Properties/AssemblyInfo.cs

@@ -6,10 +6,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-[assembly: AssemblyInformationalVersion("0.0.1")]
-[assembly: AssemblyFileVersion("0.0.1")]
 [assembly: AssemblyMetadata("Serviceable", "True")]
-[assembly: AssemblyVersion("0.0.1")]
 [assembly: CLSCompliant(true)]
 [assembly: ComVisible(false)]
 

test/Microsoft.IdentityModel.AotCompatibility.TestApp/Microsoft.IdentityModel.AotCompatibility.TestApp.csproj

@@ -5,7 +5,7 @@
     <OutputType>Exe</OutputType>
     <PublishTrimmed>true</PublishTrimmed>
     <TrimMode>full</TrimMode>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
   </PropertyGroup>
 
   <ItemGroup>