SteeltoeOSS · TimHess · Jun 3, 2020 · Jun 1, 2020 · Jun 1, 2020
diff --git a/DeterministicBuild.targets b/DeterministicBuild.targets
@@ -0,0 +1,22 @@
+<!-- Workaround. Remove once we're on 3.1.300+
+https://github.com/dotnet/sourcelink/issues/572 -->
+<Project>
+  <PropertyGroup>
+    <TargetFrameworkMonikerAssemblyAttributesPath>$([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(TargetFrameworkMoniker).AssemblyAttributes$(DefaultLanguageSourceExtension)'))</TargetFrameworkMonikerAssemblyAttributesPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <EmbeddedFiles Include="$(GeneratedAssemblyInfoFile)"/>
+  </ItemGroup>
+  <ItemGroup>
+    <SourceRoot Include="$(NuGetPackageRoot)" />
+  </ItemGroup>
+
+  <Target Name="CoverletGetPathMap"
+          DependsOnTargets="InitializeSourceRootMappedPaths"
+          Returns="@(_LocalTopLevelSourceRoot)"
+          Condition="'$(DeterministicSourcePaths)' == 'true'">
+    <ItemGroup>
+      <_LocalTopLevelSourceRoot Include="@(SourceRoot)" Condition="'%(SourceRoot.NestedRoot)' == ''"/>
+    </ItemGroup>
+  </Target>
+</Project>
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -0,0 +1,4 @@
+<Project>
+  <!-- Deterministic build workaround -->
+  <Import Project="$(MSBuildThisFileDirectory)DeterministicBuild.targets" />
+</Project>
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -28,6 +28,16 @@ jobs:
     inputs:
       filePath: src/Connectors/EnableGemFire.ps1
       arguments: $(PivNetAPIToken)
+  - task: UseDotNet@2
+    displayName: 'Install .NET Core 2.x SDK'
+    inputs:
+      packageType: sdk
+      version: 2.1.806
+  - task: UseDotNet@2
+    displayName: 'Install .NET Core 3.x SDK'
+    inputs:
+      packageType: sdk
+      version: 3.1.300
   - task: DotNetCoreCLI@2
     displayName: dotnet restore
     inputs:
@@ -44,7 +54,7 @@ jobs:
     inputs:
       command: test
       projects: '**/*.Test/*.csproj'
-      arguments: '-c $(buildConfiguration) -maxcpucount:1 --filter "Category!=SkipOnLinux"'
+      arguments: '--no-build -c $(buildConfiguration) -maxcpucount:1 --filter "Category!=SkipOnLinux"'
 - job: MacOS_Build_and_Test
   pool:
     vmImage: 'macOS-latest'
@@ -58,12 +68,12 @@ jobs:
     displayName: 'Install .NET Core 2.x SDK'
     inputs:
       packageType: sdk
-      version: 2.2.300
+      version: 2.1.806
   - task: UseDotNet@2
     displayName: 'Install .NET Core 3.x SDK'
     inputs:
       packageType: sdk
-      version: 3.0.100
+      version: 3.1.300
   - task: DotNetCoreCLI@2
     displayName: dotnet restore
     inputs:
@@ -80,7 +90,7 @@ jobs:
     inputs:
       command: test
       projects: '**/*.Test/*.csproj'
-      arguments: '-c $(buildConfiguration) -maxcpucount:1 --filter "Category!=SkipOnMacOS"'
+      arguments: '--no-build -c $(buildConfiguration) -maxcpucount:1 --filter "Category!=SkipOnMacOS"'
 - job: Windows_Build_Test_and_Package
   timeoutInMinutes: 90
   pool:
@@ -105,6 +115,16 @@ jobs:
     inputs:
       filePath: src/Connectors/EnableGemFire.ps1
       arguments: $(PivNetAPIToken)
+  - task: UseDotNet@2
+    displayName: 'Install .NET Core 2.x SDK'
+    inputs:
+      packageType: sdk
+      version: 2.1.806
+  - task: UseDotNet@2
+    displayName: 'Install .NET Core 3.x SDK'
+    inputs:
+      packageType: sdk
+      version: 3.1.300
   - task: DotNetCoreCLI@2
     displayName: dotnet restore
     inputs:
@@ -117,29 +137,28 @@ jobs:
       organization: 'steeltoeoss'
       projectKey: 'SteeltoeOSS_steeltoe'
       extraProperties: |
-        sonar.cs.opencover.reportsPaths=$(Build.SourcesDirectory)/**/coverage.opencover.xml
-        sonar.cs.vstest.reportsPaths=$(Agent.TempDirectory)/*.trx
-        sonar.exclusions=$(Build.SourcesDirectory)/src/Management/OpenCensus, $(Build.SourcesDirectory)/src/Management/OpenCensus.*
+        sonar.cs.opencover.reportsPaths=$(Build.SourcesDirectory)\**\*opencover.xml
+        sonar.cs.vstest.reportsPaths=$(Agent.TempDirectory)\*.trx
+        sonar.exclusions=$(Build.SourcesDirectory)\src\Management\OpenCensus*
+        sonar.coverage.exclusions=**/*Test*/**/*
   - task: DotNetCoreCLI@2
-    displayName: dotnet pack
+    displayName: dotnet build
     inputs:
-      command: 'pack'
+      command: 'build'
       feedsToUse: 'select'
-      arguments: '--no-restore -c $(buildConfiguration) /p:TreatWarningsAsErrors=True /p:VersionPrefix=$(VersionPrefix) /p:VersionSuffix=$(VersionSuffix)'
-      packagesToPack: 'src/Steeltoe.All.sln'
+      arguments: '--no-restore -c $(buildConfiguration) /p:VersionPrefix=$(VersionPrefix) /p:VersionSuffix=$(VersionSuffix)'
+      projects: 'src/Steeltoe.All.sln'
       versioningScheme: 'byEnvVar'
       versionEnvVar: PackageVersion
   - task: DotNetCoreCLI@2
     displayName: dotnet test
     inputs:
       command: test
       projects: 'src/Steeltoe.All.sln'
-      arguments: '-c $(buildConfiguration) -maxcpucount:1 /p:TreatWarningsAsErrors=True /p:CopyLocalLockFileAssemblies=true --filter "Category!=Integration" /p:CollectCoverage=true /p:CoverletOutputFormat="opencover" /p:Include="[Steeltoe.*]*" /p:Exclude="[*.Test]*"'
+      arguments: '--no-build -c $(buildConfiguration) -maxcpucount:1 /p:CopyLocalLockFileAssemblies=true --filter "Category!=Integration" /p:CollectCoverage=true /p:CoverletOutputFormat="opencover" /p:Include="[Steeltoe.*]*" /p:Exclude="[*.Test*]*%2c[*]Microsoft.Diagnostics*"'
   # Generate the report using ReportGenerator (https://github.com/danielpalme/ReportGenerator)
   # First install the tool on the machine, then run it
-  - pwsh: |
-      dotnet tool install -g dotnet-reportgenerator-globaltool
-      reportgenerator "-reports:**\coverage.opencover.xml" "-targetdir:$(Build.SourcesDirectory)\CodeCoverage" -reporttypes:Cobertura
+  - pwsh: dotnet tool install -g dotnet-reportgenerator-globaltool; reportgenerator "-reports:**\*.opencover.xml" "-targetdir:$(Build.SourcesDirectory)\CodeCoverage" -reporttypes:Cobertura
     displayName: Create Code coverage report
     condition: always()
   # Publish the code coverage result (summary and web site)
@@ -152,9 +171,7 @@ jobs:
       summaryFileLocation: '$(Build.SourcesDirectory)\CodeCoverage\Cobertura.xml'
       reportDirectory: '$(Build.SourcesDirectory)\CodeCoverage'
     condition: always()
-  - pwsh: |
-      choco install codecov
-      codecov -f "$(Build.SourcesDirectory)\CodeCoverage\Cobertura.xml" -t $env:CodeCovToken
+  - pwsh: choco install codecov --no-progress; codecov -f "$(Build.SourcesDirectory)\CodeCoverage\Cobertura.xml" -t $env:CodeCovToken
     env:
       CodeCovToken: $(CodeCovToken)
     displayName: Install and Run CodeCov
@@ -165,6 +182,14 @@ jobs:
   - task: SonarSource.sonarcloud.38b27399-a642-40af-bb7d-9971f69712e8.SonarCloudPublish@1
     displayName: Publish Quality Gate Result
     condition: always()
+  - task: DotNetCoreCLI@2
+    displayName: dotnet pack
+    inputs:
+      command: 'pack'
+      feedsToUse: 'select'
+      packagesToPack: 'src/Steeltoe.All.sln'
+      versioningScheme: 'byEnvVar'
+      versionEnvVar: PackageVersion
   - task: PowerShell@2
     displayName: Authenticode Sign Packages
     inputs:

diff --git a/sharedtest.props b/sharedtest.props
@@ -5,6 +5,10 @@
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
+    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+  </PropertyGroup>
   <ItemGroup>
     <AdditionalFiles Include="..\..\..\..\stylecop.json">
       <Link>stylecop.json</Link>

diff --git a/src/CircuitBreaker/src/Hystrix.MetricsEventsCore/CancellationTokenExtensions.cs b/src/CircuitBreaker/src/Hystrix.MetricsEventsCore/CancellationTokenExtensions.cs
@@ -1,16 +1,6 @@
-// Copyright 2017 the original author or authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information.
 
 using System;
 using System.Runtime.CompilerServices;

diff --git a/...CircuitBreaker/src/Hystrix.MetricsEventsCore/Controllers/HystrixConfigStreamController.cs b/...CircuitBreaker/src/Hystrix.MetricsEventsCore/Controllers/HystrixConfigStreamController.cs
@@ -1,16 +1,6 @@
-// Copyright 2017 the original author or authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information.
 
 using Microsoft.AspNetCore.Mvc;
 using Steeltoe.CircuitBreaker.Hystrix.Config;

diff --git a/...ircuitBreaker/src/Hystrix.MetricsEventsCore/Controllers/HystrixMetricsStreamController.cs b/...ircuitBreaker/src/Hystrix.MetricsEventsCore/Controllers/HystrixMetricsStreamController.cs
@@ -1,16 +1,6 @@
-// Copyright 2017 the original author or authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information.
 
 using Microsoft.AspNetCore.Mvc;
 using Steeltoe.CircuitBreaker.Hystrix.Metric.Consumer;

diff --git a/...tBreaker/src/Hystrix.MetricsEventsCore/Controllers/HystrixRequestEventStreamController.cs b/...tBreaker/src/Hystrix.MetricsEventsCore/Controllers/HystrixRequestEventStreamController.cs
@@ -1,16 +1,6 @@
-// Copyright 2017 the original author or authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information.
 
 using Microsoft.AspNetCore.Mvc;
 using Steeltoe.CircuitBreaker.Hystrix.Metric;

diff --git a/src/CircuitBreaker/src/Hystrix.MetricsEventsCore/Controllers/HystrixStreamBaseController.cs b/src/CircuitBreaker/src/Hystrix.MetricsEventsCore/Controllers/HystrixStreamBaseController.cs
@@ -1,16 +1,6 @@
-// Copyright 2017 the original author or authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information.
 
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;

diff --git a/...itBreaker/src/Hystrix.MetricsEventsCore/Controllers/HystrixUtilizationStreamController.cs b/...itBreaker/src/Hystrix.MetricsEventsCore/Controllers/HystrixUtilizationStreamController.cs
@@ -1,16 +1,6 @@
-// Copyright 2017 the original author or authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information.
 
 using Microsoft.AspNetCore.Mvc;
 using Steeltoe.CircuitBreaker.Hystrix.Metric.Sample;

diff --git a/src/CircuitBreaker/src/Hystrix.MetricsEventsCore/HystrixApplicationBuilderExtensions.cs b/src/CircuitBreaker/src/Hystrix.MetricsEventsCore/HystrixApplicationBuilderExtensions.cs
@@ -1,16 +1,6 @@
-// Copyright 2017 the original author or authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information.
 
 using Microsoft.AspNetCore.Builder;
 

diff --git a/src/CircuitBreaker/src/Hystrix.MetricsEventsCore/HystrixServiceCollectionExtensions.cs b/src/CircuitBreaker/src/Hystrix.MetricsEventsCore/HystrixServiceCollectionExtensions.cs
@@ -1,16 +1,6 @@
-// Copyright 2017 the original author or authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information.
 
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;

diff --git a/src/CircuitBreaker/src/Hystrix.MetricsEventsCore/Properties/AssemblyInfo.cs b/src/CircuitBreaker/src/Hystrix.MetricsEventsCore/Properties/AssemblyInfo.cs
@@ -1,16 +1,6 @@
-// Copyright 2017 the original author or authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information.
 
 using System.Reflection;
 using System.Runtime.CompilerServices;

diff --git a/src/CircuitBreaker/src/Hystrix.MetricsStreamAutofac/HystrixContainerBuilderExtensions.cs b/src/CircuitBreaker/src/Hystrix.MetricsStreamAutofac/HystrixContainerBuilderExtensions.cs
@@ -1,16 +1,6 @@
-// Copyright 2017 the original author or authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information.
 
 using Autofac;
 using Microsoft.Extensions.Configuration;

diff --git a/src/CircuitBreaker/src/Hystrix.MetricsStreamAutofac/Properties/AssemblyInfo.cs b/src/CircuitBreaker/src/Hystrix.MetricsStreamAutofac/Properties/AssemblyInfo.cs
@@ -1,16 +1,6 @@
-// Copyright 2017 the original author or authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information.
 
 using System.Reflection;
 using System.Runtime.CompilerServices;