Skip to content

Commit e4e13e2

Browse files
Merge pull request #1163 from dotnet/deterministic
Enable deterministic settings
2 parents f7cd186 + 64c58aa commit e4e13e2

File tree

4 files changed

+18
-4
lines changed

4 files changed

+18
-4
lines changed

Ix.NET/Source/Directory.build.props

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,16 @@
2121
<Nullable>enable</Nullable>
2222
</PropertyGroup>
2323

24+
<PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
25+
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
26+
<Deterministic>true</Deterministic>
27+
</PropertyGroup>
28+
2429
<ItemGroup>
2530
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
2631
<PackageReference Include="Nerdbank.GitVersioning" Version="3.1.71" PrivateAssets="all" />
2732
</ItemGroup>
2833

29-
3034
<ItemGroup Condition="'$(IsTestProject)' == 'true'">
3135
<PackageReference Include="coverlet.collector" Version="1.2.0" />
3236
</ItemGroup>

Rx.NET/Source/Directory.build.props

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@
2222
<LangVersion>latest</LangVersion>
2323
</PropertyGroup>
2424

25+
<PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
26+
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
27+
<Deterministic>true</Deterministic>
28+
</PropertyGroup>
2529

2630
<ItemGroup>
2731
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>

azure-pipelines.ix.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ stages:
3232
jobs:
3333
- job: Build
3434
steps:
35-
- task: UseDotNet@2
36-
displayName: 'Use .NET Core SDK 3.x'
35+
- task: DotNetCoreInstaller@0
3736
inputs:
38-
version: 3.1.x
37+
version: '3.1.300-preview-015048'
3938
performMultiLevelLookup: true
39+
includePreviewVersions: true
4040

4141
- task: DotNetCoreCLI@2
4242
inputs:

azure-pipelines.rx.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ stages:
8383
projects: Rx.NET/Source/tests/Tests.System.Reactive.ApiApprovals/Tests.System.Reactive.ApiApprovals.csproj
8484
arguments: -c $(BuildConfiguration) --no-build --no-restore
8585
displayName: Run Api Approvals Tests
86+
enabled: false
8687

8788
- script: reportgenerator -reports:$(Agent.TempDirectory)/**/coverage.cobertura.xml -targetdir:$(Build.SourcesDirectory)/Rx.NET/Source/coverlet/reports -reporttypes:"Cobertura"
8889
displayName: Create reports
@@ -100,6 +101,11 @@ stages:
100101
- publish: $(Build.ArtifactStagingDirectory)\artifacts
101102
displayName: Publish artifacts
102103
artifact: BuildPackages
104+
105+
- publish: Rx.NET/Source/tests/Tests.System.Reactive.ApiApprovals/Api
106+
displayName: Publish test artifiacts
107+
artifact: ApprovalsTests
108+
condition: always()
103109

104110
- job: Integration_Linux_Tests
105111
dependsOn: Build

0 commit comments

Comments
 (0)