Skip to content

Commit c026277

Browse files
slozierslozier
authored
Deterministic build (IronLanguages#727)
* Deterministic build * Add source link to SQLite/Wpf assemblies * Revert SDK to fix Windows build * Revert dotnet SDK on Azure
1 parent 41126a6 commit c026277

6 files changed

Lines changed: 18 additions & 4 deletions

File tree

‎.github/workflows/main.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ jobs:
1919
- uses: actions/checkout@v1
2020
with:
2121
submodules: true
22-
- uses: actions/setup-dotnet@v1.4.0
22+
- uses: actions/setup-dotnet@v1.5.0
2323
with:
24-
dotnet-version: '3.1.100'
24+
dotnet-version: '3.1.302'
2525
- name: Set Mono Version
2626
if: matrix.os == 'macos-latest'
2727
run: echo ::add-path::/Library/Frameworks/Mono.framework/Versions/6.4.0/bin

‎Build/steps.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ steps:
3434
displayName: Install .NET Core 3.1 SDK for build
3535
inputs:
3636
packageType: 'sdk'
37-
version: '3.1.100'
37+
version: '3.1.302'
3838

3939
# Set Mono version on macOS
4040
- ${{ if eq(parameters.os, 'macOS') }}:

‎Directory.Build.props‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,19 @@
4242
<DisplayVersion Condition="'$(ReleaseLevel)' == 'final' and '$(MicroVersion)' != '0'">$(MajorVersion).$(MinorVersion).$(MicroVersion)</DisplayVersion>
4343
<DisplayVersion Condition="'$(ReleaseLevel)' != 'final'">$(MajorVersion).$(MinorVersion).$(MicroVersion)$(ShortReleaseLevel)$(ReleaseSerial)</DisplayVersion>
4444
</PropertyGroup>
45+
46+
<!-- Deterministic build -->
47+
<PropertyGroup Condition="'$(TF_BUILD)' == 'true' or '$(GITHUB_ACTIONS)' == 'true'">
48+
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
49+
</PropertyGroup>
50+
51+
<PropertyGroup>
52+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
53+
</PropertyGroup>
54+
55+
<ItemGroup>
56+
<SourceRoot Include="$(MSBuildThisFileDirectory)/" />
57+
</ItemGroup>
4558

4659
<!-- Signing -->
4760
<PropertyGroup>

‎Src/IronPython.SQLite/IronPython.SQLite.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
<PrivateAssets>all</PrivateAssets>
2727
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2828
</PackageReference>
29+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
2930
</ItemGroup>
3031

3132
<Import Project="$(AfterTargetFiles)" />

‎Src/IronPython.Wpf/IronPython.Wpf.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
<PrivateAssets>all</PrivateAssets>
2828
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2929
</PackageReference>
30+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
3031
</ItemGroup>
3132

3233
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk.WindowsDesktop" Condition=" '$(OS)' == 'Windows_NT' " />

‎Src/IronPython/IronPython.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
<ItemGroup Condition=" '$(IsFullFramework)' == 'true' ">
1919
<Reference Include="System.Xml" />
20-
<Reference Include="System.Configuration" Condition=" $(Features.Contains('FEATURE_CONFIGURATION')) " />
2120
<Reference Include="System.Runtime.Remoting" Condition=" $(Features.Contains('FEATURE_REMOTING')) " />
2221
</ItemGroup>
2322

0 commit comments

Comments
 (0)