Fixed versioning. (#15)

fluxera · Dec 17, 2021 · 6ad6e7a · 6ad6e7a
1 parent 071fec8
commit 6ad6e7a
Show file tree

Hide file tree

Showing 44 changed files with 176 additions and 288 deletions.
diff --git a/Fluxera.Extensions.sln b/Fluxera.Extensions.sln
@@ -7,7 +7,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".items", ".items", "{75AC41
 	ProjectSection(SolutionItems) = preProject
 		.gitignore = .gitignore
 		azure-pipelines.yml = azure-pipelines.yml
-		Directory.Build.props = Directory.Build.props
 		GitVersion.yml = GitVersion.yml
 		global.json = global.json
 		icon.png = icon.png
@@ -16,8 +15,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".items", ".items", "{75AC41
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{DF28D730-99B3-4811-AAC7-725A73B3F668}"
+	ProjectSection(SolutionItems) = preProject
+		src\Directory.Build.props = src\Directory.Build.props
+	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{F18D2D58-282C-4D93-8D9A-3A76CF98F018}"
+	ProjectSection(SolutionItems) = preProject
+		tests\Directory.Build.props = tests\Directory.Build.props
+	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Fluxera.Extensions.Common.Abstractions", "src\Fluxera.Extensions.Common.Abstractions\Fluxera.Extensions.Common.Abstractions.csproj", "{C4F333DA-F84F-408D-A3F5-C539AC841D21}"
 EndProject
@@ -63,13 +68,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Fluxera.Extensions.Http.Abs
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Fluxera.Extensions.Http", "src\Fluxera.Extensions.Http\Fluxera.Extensions.Http.csproj", "{B1334FCB-46E8-4349-94AE-4B2F4C094052}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fluxera.Extensions.Http.UnitTests", "tests\Fluxera.Extensions.Http.UnitTests\Fluxera.Extensions.Http.UnitTests.csproj", "{C7973DF8-8570-4982-B209-D406894E2E8B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Fluxera.Extensions.Http.UnitTests", "tests\Fluxera.Extensions.Http.UnitTests\Fluxera.Extensions.Http.UnitTests.csproj", "{C7973DF8-8570-4982-B209-D406894E2E8B}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Fluxera.Extensions.OData.Abstractions", "src\Fluxera.Extensions.OData.Abstractions\Fluxera.Extensions.OData.Abstractions.csproj", "{A3664A26-82FB-46E8-9DA0-11E84E5133F7}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Fluxera.Extensions.OData", "src\Fluxera.Extensions.OData\Fluxera.Extensions.OData.csproj", "{EE64DD6B-E401-4502-BF22-FF33DB0BBBBE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fluxera.Extensions.OData.UnitTests", "tests\Fluxera.Extensions.OData.UnitTests\Fluxera.Extensions.OData.UnitTests.csproj", "{41A6CC4C-80AB-45EF-9E55-B719E9B87F6E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Fluxera.Extensions.OData.UnitTests", "tests\Fluxera.Extensions.OData.UnitTests\Fluxera.Extensions.OData.UnitTests.csproj", "{41A6CC4C-80AB-45EF-9E55-B719E9B87F6E}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/GitVersion.yml b/GitVersion.yml
@@ -1,6 +1 @@
-next-version: 6.0.0
 mode: Mainline
-
-branches:
-   master:
-      regex: ^master$|^main$
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -7,40 +7,31 @@ trigger:
 
 variables:
   BuildConfiguration: Release
-  DotNetCoreVersion: 6.0.100
+  DotNetCoreVersion: 6.0.101
 
 stages:
 - stage: BuildAndTest
   jobs:
   - job: BuildAndTest
     pool:
-      vmImage: 'windows-latest'
+      name: Default
     steps:
     - checkout: self
       persistCredentials: 'true'
       clean: true
-    # Run GitVersion to acquire the current build version.
-    - task: GitVersion@5
-      displayName: 'Acquire and Apply Version'
-      inputs:
-        updateAssemblyInfo: true
-        updateAssemblyInfoFilename: 'src/SolutionInfo.cs'
-        additionalArguments: '/ensureassemblyinfo'
-        configFilePath: 'GitVersion.yml'
     # Install the desired .NET SDK.   
     - task: UseDotNet@2
       displayName: 'Acquire .NET SDK'
       inputs:
         packageType: 'sdk'
         version: $(DotNetCoreVersion)
-        includePreviewVersions: true   
+        includePreviewVersions: false   
     # Build all projects.
     - task: DotNetCoreCLI@2
       displayName: 'Build Projects'
       inputs:
         projects: '**/*.csproj'
         arguments: '--configuration $(BuildConfiguration)'
-        nugetConfigPath: NuGet.config  
     # Run all available tests.
     - task: DotNetCoreCLI@2
       displayName: 'Execute Tests'
@@ -49,70 +40,19 @@ stages:
         projects: '**/*Tests/*.csproj'
         arguments: '--configuration $(BuildConfiguration)'
         nobuild: true
-    # Set the version to a environment variable. This will be used in the NuGet pack task.
-    - script: echo %Action%%SemVerEnv%
-      displayName: 'Set Package Version Variable'
-      env:
-        Action: '##vso[task.setvariable variable=NuGetPackageVersion]'
-        SemVerEnv: $(GitVersion.SemVer)
     # Create the NuGet packages.
     - task: DotNetCoreCLI@2
-      displayName: 'NuGet Pack Packages'
+      displayName: 'Pack Packages'
       inputs:
         command: 'pack'
         packagesToPack: 'src/**/*.csproj'
         nobuild: true
-        versioningScheme: 'byEnvVar'
-        versionEnvVar: 'NuGetPackageVersion'
         verbosityPack: Minimal
         includesymbols: false
     # Copy created NuGet packages to the builds artifacts directory.
     - task: PublishBuildArtifacts@1
-      displayName: 'NuGet Publish Package Artifacts'
+      displayName: 'Publish Package Artifacts'
       inputs:
         PathtoPublish: '$(Build.ArtifactStagingDirectory)'
         ArtifactName: 'drop'
-        publishLocation: 'Container'
-#- stage: DeployPackages
-#  dependsOn: BuildAndTest
-#  # Only publish packages for main, develop (alpha) and release (beta) branches.
-#  condition: and(succeeded('BuildAndTest'), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/develop'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release/')))
-#  jobs:
-#  - job: DeployPackages
-#    pool:
-#      vmImage: 'windows-latest'
-#    steps:
-#    - checkout: self
-#      persistCredentials: 'true'
-#      clean: true
-#    # Run GitVersion to acquire the current build version.
-#    - task: GitVersion@5
-#      displayName: 'Acquire and Apply Version'
-#      inputs:
-#        updateAssemblyInfo: false
-#        configFilePath: 'GitVersion.yml'
-#    # Download the created packages.
-#    - task: DownloadBuildArtifacts@0
-#      inputs:
-#        buildType: 'current'
-#        downloadType: 'single'
-#        artifactName: 'drop'
-#        downloadPath: '$(System.ArtifactsDirectory)'
-#    # Publish the NuGet packages to the package feed.
-#    # https://www.programmingwithwolfgang.com/azure-devops-publish-nuget/
-#    - task: DotNetCoreCLI@2
-#      condition: not(contains(variables['Build.BuildNumber'], '-ci'))
-#      displayName: 'NuGet Push Packages'
-#      inputs:
-#        command: custom
-#        custom: nuget
-#        arguments: >
-#          push $(System.ArtifactsDirectory)/**/*.nupkg
-#          -s https://api.nuget.org/v3/index.json
-#          -k $(NuGetApiKey)
-#        #command: 'push'
-#        #packagesToPush: '$(System.ArtifactsDirectory)/**/*.nupkg'
-#        #nuGetFeedType: 'external'
-#        #publishFeedCredentials: 'Foundation'
-#        #verbosityRestore: Normal
-#        #includesymbols: false
+        publishLocation: 'Container'
diff --git a/Directory.Build.props → src/Directory.Build.props b/Directory.Build.props → src/Directory.Build.props
@@ -2,21 +2,16 @@
 
 	<PropertyGroup>
 		<LangVersion>latest</LangVersion>
-		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
 		<Nullable>enable</Nullable>
 		<ImplicitUsings>disable</ImplicitUsings>
+		<GenerateDocumentationFile>true</GenerateDocumentationFile>
+		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 	</PropertyGroup>
 
 	<PropertyGroup>
 		<Company>Fluxera Software Development GmbH</Company>
-		<Copyright>Copyright © 2014-2021 Fluxera Software Development GmbH. All rights reserved.</Copyright>
 		<Product>Fluxera Software Foundation</Product>
-	</PropertyGroup>
-
-	<PropertyGroup>
-		<Version>6.0.0</Version>
-		<AssemblyVersion>6.0.0</AssemblyVersion>
-		<FileVersion>6.0.0</FileVersion>
+		<Copyright>Copyright © 2014-2021 Fluxera Software Development GmbH. All rights reserved.</Copyright>
 	</PropertyGroup>
 
 	<PropertyGroup>
@@ -30,7 +25,12 @@
 		<NeutralLanguage>en</NeutralLanguage>
 		<RepositoryType>git</RepositoryType>
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
-		<PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
+		<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
 	</PropertyGroup>
 
+	<Target Name="Update Version" BeforeTargets="Build" Condition="'$(TF_BUILD)' == 'true'">
+		<Message Text="Version = $(GITVERSION_FullSemVer)" Importance="High" />
+		<Message Text="##vso[build.updatebuildnumber]$(GITVERSION_FullSemVer)" Importance="High" />
+	</Target>
+
 </Project>
diff --git a/src/Fluxera.Extensions.Caching.Abstractions/Fluxera.Extensions.Caching.Abstractions.csproj b/src/Fluxera.Extensions.Caching.Abstractions/Fluxera.Extensions.Caching.Abstractions.csproj
@@ -5,15 +5,12 @@
 	</PropertyGroup>
 
 	<PropertyGroup>
-		<PackageTags>fluxera;library;extensions;services;caching</PackageTags>
+		<Title>Fluxera.Extensions.Caching.Abstractions</Title>
 		<Description>The abstractions for the custom extensions for caching.</Description>
+		<PackageTags>fluxera;library;extensions;services;caching</PackageTags>
 		<RootNamespace>$(MSBuildProjectName.Replace(" ", "_").Replace(".Abstractions",""))</RootNamespace>
 	</PropertyGroup>
 
-	<ItemGroup>
-		<Compile Include="..\SolutionInfo.cs" Link="Properties\SolutionInfo.cs" />
-	</ItemGroup>
-
 	<ItemGroup>
 		<None Include="..\..\README.md" Link="Properties\README.md">
 			<Pack>true</Pack>
@@ -26,6 +23,10 @@
 	</ItemGroup>
 
 	<ItemGroup>
+		<PackageReference Include="GitVersion.MsBuild" Version="5.8.1">
+		  <PrivateAssets>all</PrivateAssets>
+		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
 		<PackageReference Include="JetBrains.Annotations" Version="2021.3.0" />
 		<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0" />
 	</ItemGroup>

diff --git a/src/Fluxera.Extensions.Caching.Abstractions/Properties/AssemblyInfo.cs b/src/Fluxera.Extensions.Caching.Abstractions/Properties/AssemblyInfo.cs
diff --git a/src/Fluxera.Extensions.Caching/Fluxera.Extensions.Caching.csproj b/src/Fluxera.Extensions.Caching/Fluxera.Extensions.Caching.csproj
@@ -5,14 +5,11 @@
 	</PropertyGroup>
 
 	<PropertyGroup>
-		<PackageTags>fluxera;library;extensions;caching</PackageTags>
+		<Title>Fluxera.Extensions.Caching</Title>
 		<Description>The custom extensions for caching.</Description>
+		<PackageTags>fluxera;library;extensions;caching</PackageTags>
 	</PropertyGroup>
 
-	<ItemGroup>
-		<Compile Include="..\SolutionInfo.cs" Link="Properties\SolutionInfo.cs" />
-	</ItemGroup>
-
 	<ItemGroup>
 		<None Include="..\..\README.md" Link="Properties\README.md">
 			<Pack>true</Pack>
@@ -25,9 +22,13 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Fluxera.Guards" Version="6.0.5" />
+		<PackageReference Include="Fluxera.Guards" Version="6.0.7" />
+		<PackageReference Include="GitVersion.MsBuild" Version="5.8.1">
+		  <PrivateAssets>all</PrivateAssets>
+		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
 		<PackageReference Include="JetBrains.Annotations" Version="2021.3.0" />
-		<PackageReference Include="System.Text.Json" Version="6.0.0" />
+		<PackageReference Include="System.Text.Json" Version="6.0.1" />
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />

diff --git a/src/Fluxera.Extensions.Caching/Properties/AssemblyInfo.cs b/src/Fluxera.Extensions.Caching/Properties/AssemblyInfo.cs
diff --git a/src/Fluxera.Extensions.Common.Abstractions/Fluxera.Extensions.Common.Abstractions.csproj b/src/Fluxera.Extensions.Common.Abstractions/Fluxera.Extensions.Common.Abstractions.csproj
@@ -5,15 +5,12 @@
 	</PropertyGroup>
 
 	<PropertyGroup>
-		<PackageTags>fluxera;library;extensions;services;common</PackageTags>
+		<Title>Fluxera.Extensions.Common.Abstractions</Title>
 		<Description>The abstractions for the common services.</Description>
+		<PackageTags>fluxera;library;extensions;services;common</PackageTags>
 		<RootNamespace>$(MSBuildProjectName.Replace(" ", "_").Replace(".Abstractions",""))</RootNamespace>
 	</PropertyGroup>
 
-	<ItemGroup>
-		<Compile Include="..\SolutionInfo.cs" Link="Properties\SolutionInfo.cs" />
-	</ItemGroup>
-
 	<ItemGroup>
 		<None Include="..\..\README.md" Link="Properties\README.md">
 			<Pack>true</Pack>
@@ -26,6 +23,10 @@
 	</ItemGroup>
 
 	<ItemGroup>
+	  <PackageReference Include="GitVersion.MsBuild" Version="5.8.1">
+	    <PrivateAssets>all</PrivateAssets>
+	    <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+	  </PackageReference>
 	  <PackageReference Include="JetBrains.Annotations" Version="2021.3.0" />
 	</ItemGroup>
 

diff --git a/src/Fluxera.Extensions.Common.Abstractions/Properties/AssemblyInfo.cs b/src/Fluxera.Extensions.Common.Abstractions/Properties/AssemblyInfo.cs
diff --git a/src/Fluxera.Extensions.Common/Fluxera.Extensions.Common.csproj b/src/Fluxera.Extensions.Common/Fluxera.Extensions.Common.csproj
@@ -5,14 +5,11 @@
 	</PropertyGroup>
 
 	<PropertyGroup>
-		<PackageTags>fluxera;library;extensions;services;common</PackageTags>
+		<Title>Fluxera.Extensions.Common</Title>
 		<Description>The common services.</Description>
+		<PackageTags>fluxera;library;extensions;services;common</PackageTags>
 	</PropertyGroup>
 
-	<ItemGroup>
-		<Compile Include="..\SolutionInfo.cs" Link="Properties\SolutionInfo.cs" />
-	</ItemGroup>
-
 	<ItemGroup>
 		<None Include="..\..\README.md" Link="Properties\README.md">
 			<Pack>true</Pack>
@@ -25,8 +22,12 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Fluxera.Guards" Version="6.0.5" />
-		<PackageReference Include="Fluxera.Utilities" Version="6.0.4" />
+		<PackageReference Include="Fluxera.Guards" Version="6.0.7" />
+		<PackageReference Include="Fluxera.Utilities" Version="6.0.8" />
+		<PackageReference Include="GitVersion.MsBuild" Version="5.8.1">
+		  <PrivateAssets>all</PrivateAssets>
+		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
 		<PackageReference Include="JetBrains.Annotations" Version="2021.3.0" />
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />

diff --git a/src/Fluxera.Extensions.Common/Properties/AssemblyInfo.cs b/src/Fluxera.Extensions.Common/Properties/AssemblyInfo.cs
diff --git a/...ensions.DataManagement.Abstractions/Fluxera.Extensions.DataManagement.Abstractions.csproj b/...ensions.DataManagement.Abstractions/Fluxera.Extensions.DataManagement.Abstractions.csproj
@@ -5,15 +5,12 @@
 	</PropertyGroup>
 
 	<PropertyGroup>
-		<PackageTags>fluxera;library;extensions;data</PackageTags>
+		<Title>Fluxera.Extensions.DataManagement.Abstractions</Title>
 		<Description>The abstractions for the extensions for data management.</Description>
+		<PackageTags>fluxera;library;extensions;data</PackageTags>
 		<RootNamespace>$(MSBuildProjectName.Replace(" ", "_").Replace(".Abstractions",""))</RootNamespace>
 	</PropertyGroup>
 
-	<ItemGroup>
-		<Compile Include="..\SolutionInfo.cs" Link="Properties\SolutionInfo.cs" />
-	</ItemGroup>
-
 	<ItemGroup>
 		<None Include="..\..\README.md" Link="Properties\README.md">
 			<Pack>true</Pack>
@@ -26,7 +23,11 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Fluxera.Utilities" Version="6.0.4" />
+		<PackageReference Include="Fluxera.Utilities" Version="6.0.8" />
+		<PackageReference Include="GitVersion.MsBuild" Version="5.8.1">
+		  <PrivateAssets>all</PrivateAssets>
+		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
 		<PackageReference Include="JetBrains.Annotations" Version="2021.3.0" />
 	</ItemGroup>
 

diff --git a/src/Fluxera.Extensions.DataManagement.Abstractions/Properties/AssemblyInfo.cs b/src/Fluxera.Extensions.DataManagement.Abstractions/Properties/AssemblyInfo.cs