Skip to content

Commit 95f5778

Browse files
authored
Merge branch 'main' into allow-comma-as-name-field-separator
2 parents ca6c03e + 9fc0931 commit 95f5778

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

eng/Version.Details.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ This file should be imported by eng/Versions.props
2020
<!-- dotnet/arcade dependencies -->
2121
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25426.3</MicrosoftDotNetArcadeSdkPackageVersion>
2222
<!-- _git/dotnet-optimization dependencies -->
23-
<optimizationlinuxarm64MIBCRuntimePackageVersion>1.0.0-prerelease.25421.1</optimizationlinuxarm64MIBCRuntimePackageVersion>
24-
<optimizationlinuxx64MIBCRuntimePackageVersion>1.0.0-prerelease.25421.1</optimizationlinuxx64MIBCRuntimePackageVersion>
25-
<optimizationwindows_ntarm64MIBCRuntimePackageVersion>1.0.0-prerelease.25421.1</optimizationwindows_ntarm64MIBCRuntimePackageVersion>
26-
<optimizationwindows_ntx64MIBCRuntimePackageVersion>1.0.0-prerelease.25421.1</optimizationwindows_ntx64MIBCRuntimePackageVersion>
27-
<optimizationwindows_ntx86MIBCRuntimePackageVersion>1.0.0-prerelease.25421.1</optimizationwindows_ntx86MIBCRuntimePackageVersion>
23+
<optimizationlinuxarm64MIBCRuntimePackageVersion>1.0.0-prerelease.25453.1</optimizationlinuxarm64MIBCRuntimePackageVersion>
24+
<optimizationlinuxx64MIBCRuntimePackageVersion>1.0.0-prerelease.25453.1</optimizationlinuxx64MIBCRuntimePackageVersion>
25+
<optimizationwindows_ntarm64MIBCRuntimePackageVersion>1.0.0-prerelease.25453.1</optimizationwindows_ntarm64MIBCRuntimePackageVersion>
26+
<optimizationwindows_ntx64MIBCRuntimePackageVersion>1.0.0-prerelease.25453.1</optimizationwindows_ntx64MIBCRuntimePackageVersion>
27+
<optimizationwindows_ntx86MIBCRuntimePackageVersion>1.0.0-prerelease.25453.1</optimizationwindows_ntx86MIBCRuntimePackageVersion>
2828
</PropertyGroup>
2929
<!--Property group for alternate package version names-->
3030
<PropertyGroup>

eng/Version.Details.xml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="fsharp" Sha="9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad" BarId="282024" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="fsharp" Sha="8ea69c337be69385ff7eb44b2a54db78010110d8" BarId="282240" />
44
<ProductDependencies>
55
<Dependency Name="Microsoft.Build" Version="17.15.0-preview-25278-01">
66
<Uri>https://github.com/dotnet/msbuild</Uri>
@@ -48,25 +48,25 @@
4848
<Uri>https://github.com/dotnet/arcade</Uri>
4949
<Sha>5db998e02282e63bc375948a237bcdfef534a5c5</Sha>
5050
</Dependency>
51-
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.25421.1">
51+
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.25453.1">
5252
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
53-
<Sha>b0395bd1ac86994182f1b1eb73bbdf4ce6338ca9</Sha>
53+
<Sha>d9535fd3e448b454d415702ebd150a8d51711963</Sha>
5454
</Dependency>
55-
<Dependency Name="optimization.windows_nt-x86.MIBC.Runtime" Version="1.0.0-prerelease.25421.1">
55+
<Dependency Name="optimization.windows_nt-x86.MIBC.Runtime" Version="1.0.0-prerelease.25453.1">
5656
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
57-
<Sha>b0395bd1ac86994182f1b1eb73bbdf4ce6338ca9</Sha>
57+
<Sha>d9535fd3e448b454d415702ebd150a8d51711963</Sha>
5858
</Dependency>
59-
<Dependency Name="optimization.linux-x64.MIBC.Runtime" Version="1.0.0-prerelease.25421.1">
59+
<Dependency Name="optimization.linux-x64.MIBC.Runtime" Version="1.0.0-prerelease.25453.1">
6060
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
61-
<Sha>b0395bd1ac86994182f1b1eb73bbdf4ce6338ca9</Sha>
61+
<Sha>d9535fd3e448b454d415702ebd150a8d51711963</Sha>
6262
</Dependency>
63-
<Dependency Name="optimization.windows_nt-arm64.MIBC.Runtime" Version="1.0.0-prerelease.25421.1">
63+
<Dependency Name="optimization.windows_nt-arm64.MIBC.Runtime" Version="1.0.0-prerelease.25453.1">
6464
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
65-
<Sha>b0395bd1ac86994182f1b1eb73bbdf4ce6338ca9</Sha>
65+
<Sha>d9535fd3e448b454d415702ebd150a8d51711963</Sha>
6666
</Dependency>
67-
<Dependency Name="optimization.linux-arm64.MIBC.Runtime" Version="1.0.0-prerelease.25421.1">
67+
<Dependency Name="optimization.linux-arm64.MIBC.Runtime" Version="1.0.0-prerelease.25453.1">
6868
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
69-
<Sha>b0395bd1ac86994182f1b1eb73bbdf4ce6338ca9</Sha>
69+
<Sha>d9535fd3e448b454d415702ebd150a8d51711963</Sha>
7070
</Dependency>
7171
</ToolsetDependencies>
7272
</Dependencies>

tests/AheadOfTime/Trimming/check.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,5 +58,5 @@ CheckTrim -root "SelfContained_Trimming_Test" -tfm "net9.0" -outputfile "FSharp.
5858
CheckTrim -root "StaticLinkedFSharpCore_Trimming_Test" -tfm "net9.0" -outputfile "StaticLinkedFSharpCore_Trimming_Test.dll" -expected_len 9154048
5959

6060
# Check net9.0 trimmed assemblies with F# metadata resources removed
61-
CheckTrim -root "FSharpMetadataResource_Trimming_Test" -tfm "net9.0" -outputfile "FSharpMetadataResource_Trimming_Test.dll" -expected_len 7607296
61+
CheckTrim -root "FSharpMetadataResource_Trimming_Test" -tfm "net9.0" -outputfile "FSharpMetadataResource_Trimming_Test.dll" -expected_len 7607296
6262

0 commit comments

Comments
 (0)