Skip to content

Commit ad630f5

Browse files
majochamajocha
authored
Merge branch 'main' into async2
2 parents 0a7f231 + f702322 commit ad630f5

File tree

3 files changed

+32
-33
lines changed

3 files changed

+32
-33
lines changed

‎eng/Version.Details.props‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet/msbuild dependencies -->
9-
<MicrosoftBuildPackageVersion>18.0.0-preview-25476-03</MicrosoftBuildPackageVersion>
10-
<MicrosoftBuildFrameworkPackageVersion>18.0.0-preview-25476-03</MicrosoftBuildFrameworkPackageVersion>
11-
<MicrosoftBuildTasksCorePackageVersion>18.0.0-preview-25476-03</MicrosoftBuildTasksCorePackageVersion>
12-
<MicrosoftBuildUtilitiesCorePackageVersion>18.0.0-preview-25476-03</MicrosoftBuildUtilitiesCorePackageVersion>
9+
<MicrosoftBuildPackageVersion>18.0.0-preview-25502-01</MicrosoftBuildPackageVersion>
10+
<MicrosoftBuildFrameworkPackageVersion>18.0.0-preview-25502-01</MicrosoftBuildFrameworkPackageVersion>
11+
<MicrosoftBuildTasksCorePackageVersion>18.0.0-preview-25502-01</MicrosoftBuildTasksCorePackageVersion>
12+
<MicrosoftBuildUtilitiesCorePackageVersion>18.0.0-preview-25502-01</MicrosoftBuildUtilitiesCorePackageVersion>
1313
<!-- dotnet/runtime dependencies -->
1414
<SystemCollectionsImmutablePackageVersion>9.0.0</SystemCollectionsImmutablePackageVersion>
1515
<SystemComponentModelCompositionPackageVersion>9.0.0</SystemComponentModelCompositionPackageVersion>
@@ -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.25467.1</optimizationlinuxarm64MIBCRuntimePackageVersion>
24-
<optimizationlinuxx64MIBCRuntimePackageVersion>1.0.0-prerelease.25467.1</optimizationlinuxx64MIBCRuntimePackageVersion>
25-
<optimizationwindows_ntarm64MIBCRuntimePackageVersion>1.0.0-prerelease.25467.1</optimizationwindows_ntarm64MIBCRuntimePackageVersion>
26-
<optimizationwindows_ntx64MIBCRuntimePackageVersion>1.0.0-prerelease.25467.1</optimizationwindows_ntx64MIBCRuntimePackageVersion>
27-
<optimizationwindows_ntx86MIBCRuntimePackageVersion>1.0.0-prerelease.25467.1</optimizationwindows_ntx86MIBCRuntimePackageVersion>
23+
<optimizationlinuxarm64MIBCRuntimePackageVersion>1.0.0-prerelease.25502.1</optimizationlinuxarm64MIBCRuntimePackageVersion>
24+
<optimizationlinuxx64MIBCRuntimePackageVersion>1.0.0-prerelease.25502.1</optimizationlinuxx64MIBCRuntimePackageVersion>
25+
<optimizationwindows_ntarm64MIBCRuntimePackageVersion>1.0.0-prerelease.25502.1</optimizationwindows_ntarm64MIBCRuntimePackageVersion>
26+
<optimizationwindows_ntx64MIBCRuntimePackageVersion>1.0.0-prerelease.25502.1</optimizationwindows_ntx64MIBCRuntimePackageVersion>
27+
<optimizationwindows_ntx86MIBCRuntimePackageVersion>1.0.0-prerelease.25502.1</optimizationwindows_ntx86MIBCRuntimePackageVersion>
2828
</PropertyGroup>
2929
<!--Property group for alternate package version names-->
3030
<PropertyGroup>

‎eng/Version.Details.xml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@
22
<Dependencies>
33
<Source Uri="https://github.com/dotnet/dotnet" Mapping="fsharp" Sha="2dea164f01d307c409cfe0d0ee5cb8a0691e3c94" BarId="283828" />
44
<ProductDependencies>
5-
<Dependency Name="Microsoft.Build" Version="18.0.0-preview-25476-03">
5+
<Dependency Name="Microsoft.Build" Version="18.0.0-preview-25502-01">
66
<Uri>https://github.com/dotnet/msbuild</Uri>
7-
<Sha>5480b47bbc592c6feedca7c57c9863ba01e0c52c</Sha>
7+
<Sha>dc755eb75a2a1f6a82036588da128eb859d96e8e</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.Build.Framework" Version="18.0.0-preview-25476-03">
9+
<Dependency Name="Microsoft.Build.Framework" Version="18.0.0-preview-25502-01">
1010
<Uri>https://github.com/dotnet/msbuild</Uri>
11-
<Sha>5480b47bbc592c6feedca7c57c9863ba01e0c52c</Sha>
11+
<Sha>dc755eb75a2a1f6a82036588da128eb859d96e8e</Sha>
1212
</Dependency>
13-
<Dependency Name="Microsoft.Build.Tasks.Core" Version="18.0.0-preview-25476-03">
13+
<Dependency Name="Microsoft.Build.Tasks.Core" Version="18.0.0-preview-25502-01">
1414
<Uri>https://github.com/dotnet/msbuild</Uri>
15-
<Sha>5480b47bbc592c6feedca7c57c9863ba01e0c52c</Sha>
15+
<Sha>dc755eb75a2a1f6a82036588da128eb859d96e8e</Sha>
1616
</Dependency>
17-
<Dependency Name="Microsoft.Build.Utilities.Core" Version="18.0.0-preview-25476-03">
17+
<Dependency Name="Microsoft.Build.Utilities.Core" Version="18.0.0-preview-25502-01">
1818
<Uri>https://github.com/dotnet/msbuild</Uri>
19-
<Sha>5480b47bbc592c6feedca7c57c9863ba01e0c52c</Sha>
19+
<Sha>dc755eb75a2a1f6a82036588da128eb859d96e8e</Sha>
2020
</Dependency>
2121
<Dependency Name="System.Reflection.Metadata" Version="9.0.0">
2222
<Uri>https://github.com/dotnet/runtime</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.25467.1">
51+
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.25502.1">
5252
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
53-
<Sha>59dc6a9bf1b3e3ab71c73d94160c2049fb104cd1</Sha>
53+
<Sha>71ce9774e9875270b80faaac1d6b60568a80e1fa</Sha>
5454
</Dependency>
55-
<Dependency Name="optimization.windows_nt-x86.MIBC.Runtime" Version="1.0.0-prerelease.25467.1">
55+
<Dependency Name="optimization.windows_nt-x86.MIBC.Runtime" Version="1.0.0-prerelease.25502.1">
5656
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
57-
<Sha>59dc6a9bf1b3e3ab71c73d94160c2049fb104cd1</Sha>
57+
<Sha>71ce9774e9875270b80faaac1d6b60568a80e1fa</Sha>
5858
</Dependency>
59-
<Dependency Name="optimization.linux-x64.MIBC.Runtime" Version="1.0.0-prerelease.25467.1">
59+
<Dependency Name="optimization.linux-x64.MIBC.Runtime" Version="1.0.0-prerelease.25502.1">
6060
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
61-
<Sha>59dc6a9bf1b3e3ab71c73d94160c2049fb104cd1</Sha>
61+
<Sha>71ce9774e9875270b80faaac1d6b60568a80e1fa</Sha>
6262
</Dependency>
63-
<Dependency Name="optimization.windows_nt-arm64.MIBC.Runtime" Version="1.0.0-prerelease.25467.1">
63+
<Dependency Name="optimization.windows_nt-arm64.MIBC.Runtime" Version="1.0.0-prerelease.25502.1">
6464
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
65-
<Sha>59dc6a9bf1b3e3ab71c73d94160c2049fb104cd1</Sha>
65+
<Sha>71ce9774e9875270b80faaac1d6b60568a80e1fa</Sha>
6666
</Dependency>
67-
<Dependency Name="optimization.linux-arm64.MIBC.Runtime" Version="1.0.0-prerelease.25467.1">
67+
<Dependency Name="optimization.linux-arm64.MIBC.Runtime" Version="1.0.0-prerelease.25502.1">
6868
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
69-
<Sha>59dc6a9bf1b3e3ab71c73d94160c2049fb104cd1</Sha>
69+
<Sha>71ce9774e9875270b80faaac1d6b60568a80e1fa</Sha>
7070
</Dependency>
7171
</ToolsetDependencies>
7272
</Dependencies>

‎eng/Versions.props‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,12 @@
1212
<PropertyGroup>
1313
<!-- Don't use the built in support for pre-release iteration. The nuget repack task doesn't support
1414
the iteration format at the moment. https://github.com/dotnet/arcade/issues/15919 -->
15-
<FSharpPreReleaseIteration>2</FSharpPreReleaseIteration>
16-
<PreReleaseVersionLabel>rc$(FSharpPreReleaseIteration)</PreReleaseVersionLabel>
17-
<!-- These have to be in sync with latest release branch -->
15+
<FSharpPreReleaseIteration>1</FSharpPreReleaseIteration>
16+
<PreReleaseVersionLabel>alpha$(FSharpPreReleaseIteration)</PreReleaseVersionLabel>
1817
<!-- F# Version components -->
19-
<FSMajorVersion>10</FSMajorVersion>
18+
<FSMajorVersion>11</FSMajorVersion>
2019
<FSMinorVersion>0</FSMinorVersion>
21-
<FSBuildVersion>100</FSBuildVersion>
20+
<FSBuildVersion>0</FSBuildVersion>
2221
<FSRevisionVersion>0</FSRevisionVersion>
2322
<!-- -->
2423
<!-- F# Language version -->
@@ -41,7 +40,7 @@
4140
<FSharpLibrariesChangelogVersion>$(FSMajorVersion).$(FSMinorVersion).$(FSBuildVersion)</FSharpLibrariesChangelogVersion>
4241
<!-- -->
4342
<!-- The current published nuget package -->
44-
<FSharpCoreShippedPackageVersionValue>9.0.300</FSharpCoreShippedPackageVersionValue>
43+
<FSharpCoreShippedPackageVersionValue>9.0.303</FSharpCoreShippedPackageVersionValue>
4544
<!-- -->
4645
<!-- The pattern for specifying the preview package -->
4746
<FSharpCorePreviewPackageVersionValue>$(FSCorePackageVersionValue)-$(PreReleaseVersionLabel).*</FSharpCorePreviewPackageVersionValue>

0 commit comments

Comments
 (0)