Update subdomules & YAML pipelines

emmanuelbenitez · Jan 31, 2021 · 83fe45c · 83fe45c
1 parent fa95646
commit 83fe45c
Show file tree

Hide file tree

Showing 15 changed files with 16 additions and 49 deletions.
diff --git a/.resources b/.resources
diff --git a/.settings b/.settings
diff --git a/BigSolution.Common.sln b/BigSolution.Common.sln
@@ -9,7 +9,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Tests", "src\Common.
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{AB4F2125-F547-4E99-A59F-93989F4F1725}"
 	ProjectSection(SolutionItems) = preProject
-		azure-devops-prerelease.yml = azure-devops-prerelease.yml
+		azure-devops-nightly.yml = azure-devops-nightly.yml
 		azure-devops-release.yml = azure-devops-release.yml
 		azure-pipelines-ci.yml = azure-pipelines-ci.yml
 		src\Directory.Build.props = src\Directory.Build.props

diff --git a/azure-devops-prerelease.yml → azure-devops-nightly.yml b/azure-devops-prerelease.yml → azure-devops-nightly.yml
@@ -23,4 +23,4 @@ extends:
     Major: ${{ variables.versionMajor }}
     Minor: ${{ variables.versionMinor }}
     Patch: ${{ variables.versionPatch }}
-    IsPreRelease: true
+    PreRelease: "preview"
diff --git a/azure-devops-release.yml b/azure-devops-release.yml
@@ -16,5 +16,4 @@ extends:
     ProjectOrSolutionPath: "$(Build.SourcesDirectory)/BigSolution.Common.sln"
     Major: ${{ variables.versionMajor }}
     Minor: ${{ variables.versionMinor }}
-    Patch: ${{ variables.versionPatch }}
-    IsPreRelease: false
+    Patch: ${{ variables.versionPatch }}
diff --git a/azure-pipelines-ci.yml b/azure-pipelines-ci.yml
@@ -1,9 +1,6 @@
 trigger:
   - master
 
-variables:
-  - template: version-variables.yml
-
 resources:
   repositories:
     - repository: pipelineTemplateRepository
@@ -15,6 +12,3 @@ extends:
   template: Pipelines/dotnet-nuget/continuous-integration.yml@pipelineTemplateRepository
   parameters:
     ProjectOrSolutionPath: "$(Build.SourcesDirectory)/BigSolution.Common.sln"
-    Major: ${{ variables.versionMajor }}
-    Minor: ${{ variables.versionMinor }}
-    Patch: ${{ variables.versionPatch }}
diff --git a/build/BigSolution.public.snk b/build/BigSolution.public.snk
diff --git a/build/build.ps1 b/build/build.ps1
diff --git a/build/test.ps1 b/build/test.ps1
diff --git a/src/Common.Tests/Common.Tests.csproj b/src/Common.Tests/Common.Tests.csproj
@@ -8,14 +8,14 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="coverlet.msbuild" Version="2.8.0">
+      <PackageReference Include="coverlet.msbuild" Version="3.0.2">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       </PackageReference>
-      <PackageReference Include="FluentAssertions" Version="5.10.0" />
-      <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
+      <PackageReference Include="FluentAssertions" Version="5.10.3" />
+      <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
       <PackageReference Include="xunit.core" Version="2.4.1" />
-      <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+      <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       </PackageReference>

diff --git a/src/Common.Tests/TypeExtensionsFixture.cs b/src/Common.Tests/TypeExtensionsFixture.cs
@@ -1,6 +1,6 @@
 #region Copyright & License
 
-// Copyright © 2020 - 2020 Emmanuel Benitez
+// Copyright © 2020 - 2021 Emmanuel Benitez
 // 
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/src/Common/Common.csproj b/src/Common/Common.csproj
@@ -31,7 +31,7 @@
 
   <ItemGroup>
     <PackageReference Include="BigSolution.Infra.Validation" Version="2.0.0-preview20239.0" />
-    <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
+    <PackageReference Include="JetBrains.Annotations" Version="2020.3.0" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/src/Common/TypeExtensions.cs b/src/Common/TypeExtensions.cs
@@ -1,6 +1,6 @@
 #region Copyright & License
 
-// Copyright © 2020 - 2020 Emmanuel Benitez
+// Copyright © 2020 - 2021 Emmanuel Benitez
 // 
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -18,10 +18,11 @@
 -->
 <Project>
   <PropertyGroup>
-    <Major Condition=" '$(Major)' == '' ">1</Major>
+    <Major Condition=" '$(Major)' == '' ">2</Major>
     <Minor Condition=" '$(Minor)' == '' ">0</Minor>
-    <Patch Condition=" '$(Patch)' == '' ">1</Patch>
+    <Patch Condition=" '$(Patch)' == '' ">0</Patch>
   </PropertyGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)../.resources/Directory.Build.props" />
+  <Import Project="$(MSBuildThisFileDirectory)../.settings/Directory.Build.props" />
 </Project>
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
@@ -18,4 +18,5 @@
 -->
 <Project>
 	<Import Project="$(MSBuildThisFileDirectory)../.resources/Directory.Build.targets" />
+	<Import Project="$(MSBuildThisFileDirectory)../.settings/Directory.Build.targets" />
 </Project>
+12 −8		Directory.Build.props
+79 −0		code-coverage.runsettings
+20 −0		dotnet/SkipVerification.ps1
+26 −0		Directory.Build.props
+25 −0		Directory.Build.targets
+1,236 −0		JetBrains.Annotations.cs