Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge release/dev17.11 to release/dev17.12 #18105

Open
wants to merge 8 commits into
base: release/dev17.12
Choose a base branch
from
Open

Merge release/dev17.11 to release/dev17.12 #18105

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift click to select a range
e9ac555
Backport to dev17.11 - Bugfix extension method in dotnet interactive…
T-Gro Sep 27, 2024
05af489
[release/dev17.11] Update dependencies from dotnet/arcade (#17810)
dotnet-maestro[bot] Sep 27, 2024
8904b38
Requires tactics Approval: Restore the ability to identify CompileBe…
KevinRansom Oct 7, 2024
e6310fc
[release/dev17.11] Update dependencies from dotnet/arcade (#17853)
dotnet-maestro[bot] Oct 23, 2024
2456fc2
Update dependencies from https://github.com/dotnet/arcade build 20241…
dotnet-maestro[bot] Oct 26, 2024
e11d707
Merge pull request #17928 from dotnet/darc-release/dev17.11-561e7d9b-…
KevinRansom Oct 27, 2024
42efe9a
align with 17.12
vzarytovskii Dec 10, 2024
f0fad40
align with 17.12
vzarytovskii Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Requires tactics Approval: Restore the ability to identify CompileBef… 
…ore and CompileAfter values (#17838)

* Fix 17786 (#17791)

* CompilerOrder: set metadata for CompileFirst items (#17820)

Co-authored-by: Kevin Ransom (msft) <[email protected]>

* version

---------

Co-authored-by: Eugene Auduchinok <[email protected]>
  • Loading branch information
@KevinRansom @auduchinok
KevinRansom and auduchinok authored Oct 7, 2024
commit 8904b38e77a2f12b46a860e74aac0f0f6e2a5e29
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 14,7 @@
<!-- F# Version components -->
<FSMajorVersion>8</FSMajorVersion>
<FSMinorVersion>0</FSMinorVersion>
<FSBuildVersion>402</FSBuildVersion>
<FSBuildVersion>403</FSBuildVersion>
<FSRevisionVersion>0</FSRevisionVersion>
<!-- -->
<!-- F# Language version -->
Expand Down
16 changes: 16 additions & 0 deletions src/FSharp.Build/Microsoft.FSharp.NetSdk.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 130,22 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
<PackageReference>
<GeneratePathProperty>true</GeneratePathProperty>
</PackageReference>

<CompileFirst>
<CompileOrder>CompileFirst</CompileOrder>
</CompileFirst>

<CompileBefore>
<CompileOrder>CompileBefore</CompileOrder>
</CompileBefore>

<CompileAfter>
<CompileOrder>CompileAfter</CompileOrder>
</CompileAfter>

<CompileLast>
<CompileOrder>CompileLast</CompileOrder>
</CompileLast>
</ItemDefinitionGroup>

</Project>