Merge pull request #1163 from dotnet/deterministic

Enable deterministic settings
dotnet · Mar 28, 2020 · e4e13e2 · e4e13e2
2 parents f7cd186 + 64c58aa
commit e4e13e2
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git a/Ix.NET/Source/Directory.build.props b/Ix.NET/Source/Directory.build.props
@@ -21,12 +21,16 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
+    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+    <Deterministic>true</Deterministic>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
     <PackageReference Include="Nerdbank.GitVersioning" Version="3.1.71" PrivateAssets="all" />
   </ItemGroup>
 
-
   <ItemGroup Condition="'$(IsTestProject)' == 'true'">
     <PackageReference Include="coverlet.collector" Version="1.2.0" />
   </ItemGroup>

diff --git a/Rx.NET/Source/Directory.build.props b/Rx.NET/Source/Directory.build.props
@@ -22,6 +22,10 @@
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
+    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+    <Deterministic>true</Deterministic>
+  </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>

diff --git a/azure-pipelines.ix.yml b/azure-pipelines.ix.yml
@@ -32,11 +32,11 @@ stages:
   jobs:
   - job: Build
     steps:
-    - task: UseDotNet@2
-      displayName: 'Use .NET Core SDK 3.x'
+    - task: DotNetCoreInstaller@0
       inputs:
-        version: 3.1.x
+        version: '3.1.300-preview-015048'
         performMultiLevelLookup: true
+        includePreviewVersions: true
 
     - task: DotNetCoreCLI@2
       inputs:

diff --git a/azure-pipelines.rx.yml b/azure-pipelines.rx.yml
@@ -83,6 +83,7 @@ stages:
         projects: Rx.NET/Source/tests/Tests.System.Reactive.ApiApprovals/Tests.System.Reactive.ApiApprovals.csproj
         arguments: -c $(BuildConfiguration) --no-build --no-restore
       displayName: Run Api Approvals Tests
+      enabled: false
 
     - script: reportgenerator -reports:$(Agent.TempDirectory)/**/coverage.cobertura.xml -targetdir:$(Build.SourcesDirectory)/Rx.NET/Source/coverlet/reports -reporttypes:"Cobertura"
       displayName: Create reports
@@ -100,6 +101,11 @@ stages:
     - publish: $(Build.ArtifactStagingDirectory)\artifacts
       displayName: Publish artifacts
       artifact: BuildPackages
+
+    - publish: Rx.NET/Source/tests/Tests.System.Reactive.ApiApprovals/Api
+      displayName: Publish test artifiacts
+      artifact: ApprovalsTests
+      condition: always()
 
   - job: Integration_Linux_Tests
     dependsOn: Build