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 main to release/dev17.13 #18131

Merged
merged 10 commits into from
Dec 12, 2024
Merged

Merge main to release/dev17.13 #18131

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
fd29258
Backport :: Bugfix :: Support `ldelem.u8`, `ldelem.u` opcode aliases …
T-Gro Dec 2, 2024
42125e0
Streamlining test deps a bit (#18022)
psfinaki Dec 9, 2024
64bb76c
Format ILVerify output a bit (#18120)
psfinaki Dec 9, 2024
f105888
fix for race condition in FileIndex.fileIndexOfFile (#18008)
Martin521 Dec 10, 2024
9cc2a77
Merge branch 'main' into merges/release/dev17.12-to-main
vzarytovskii Dec 10, 2024
feb53ab
Update F# build version to 200
vzarytovskii Dec 10, 2024
7b1eb07
Merge pull request #18104 from dotnet/merges/release/dev17.12-to-main
vzarytovskii Dec 10, 2024
cf05314
Fix how much is trimmed from an interp string part (#18123)
abonie Dec 10, 2024
6af82c8
Sink: report SynPat.ArrayOrList type (#18127)
DedSec256 Dec 11, 2024
17c168d
Merge branch 'release/dev17.13' into merges/main-to-release/dev17.13
KevinRansom Dec 12, 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
Streamlining test deps a bit (#18022) 
* Streamlining test deps a bit

* up
  • Loading branch information
@psfinaki
psfinaki authored Dec 9, 2024
commit 42125e0be57588aa5d01bee5660ebf3434dd43c7
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 @@ -184,7 +184,7 @@
<MicrosoftNETCoreAppRefVersion>3.1.0</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreILDAsmVersion>5.0.0-preview.7.20364.11</MicrosoftNETCoreILDAsmVersion>
<MicrosoftNETCoreILAsmVersion>5.0.0-preview.7.20364.11</MicrosoftNETCoreILAsmVersion>
<MicrosoftNETTestSdkVersion>17.4.0</MicrosoftNETTestSdkVersion>
<MicrosoftNETTestSdkVersion>17.11.1</MicrosoftNETTestSdkVersion>
<NewtonsoftJsonVersion>13.0.3</NewtonsoftJsonVersion>
<RoslynToolsSignToolVersion>1.0.0-beta2-dev3</RoslynToolsSignToolVersion>
<StreamJsonRpcVersion>2.18.48</StreamJsonRpcVersion>
Expand Down
1 change: 0 additions & 1 deletion tests/EndToEndBuildTests/BasicProvider/BasicProvider.Tests/BasicProvider.Tests.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
<PackagePath>content\myfiles\</PackagePath>
</Content>
<PackageReference Include="BasicProvider" Version="1.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
</ItemGroup>

<Target Name="RemovePackagesFromCache" BeforeTargets="Restore">
Expand Down
1 change: 0 additions & 1 deletion tests/EndToEndBuildTests/ComboProvider/ComboProvider.Tests/ComboProvider.Tests.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
</None>

<PackageReference Include="ComboProvider" Version="1.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
</ItemGroup>

<Target Name="RemovePackagesFromCache" BeforeTargets="Restore">
Expand Down