Skip to content

Commit b0802c4

Browse files
vzarytovskiivzarytovskii
authored
Merge branch 'release/net8' into merges/main-to-release/net8
2 parents 78de308 + 2341436 commit b0802c4

File tree

83 files changed

+1124
-1466
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+1124
-1466
lines changed

‎NuGet.config‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
<add key="dotnet5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json" />
1212
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
1313
<add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
14-
<add key="dotnet7-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7-transport/nuget/v3/index.json" />
14+
<add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
15+
<add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
1516
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
1617
<add key="vssdk" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk/nuget/v3/index.json" />
1718
<add key="vssdk-archived" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk-archived/nuget/v3/index.json" />

‎azure-pipelines.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,11 @@ stages:
8686
# Signed build #
8787
#-------------------------------------------------------------------------------------------------------------------#
8888
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
89-
- ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/release/dev17.6') }}:
89+
- ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/release/dev17.7') }}:
9090
- template: /eng/common/templates/job/onelocbuild.yml
9191
parameters:
9292
MirrorRepo: fsharp
93-
MirrorBranch: release/dev17.6
93+
MirrorBranch: release/dev17.7
9494
LclSource: lclFilesfromPackage
9595
LclPackageId: 'LCL-JUNO-PROD-FSHARP'
9696
- template: /eng/common/templates/jobs/jobs.yml
@@ -709,8 +709,8 @@ stages:
709709
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
710710
- template: eng/release/insert-into-vs.yml
711711
parameters:
712-
componentBranchName: refs/heads/release/dev17.6
713-
insertTargetBranch: rel/d17.6
712+
componentBranchName: refs/heads/release/dev17.7
713+
insertTargetBranch: main
714714
insertTeamEmail: fsharpteam@microsoft.com
715715
insertTeamName: 'F#'
716716
completeInsertion: 'auto'

‎eng/SourceBuildPrebuiltBaseline.xml‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
<UsageData>
22
<IgnorePatterns>
3-
<UsagePattern IdentityGlob="*/*" />
3+
<UsagePattern IdentityGlob="Microsoft.SourceBuild.Intermediate.*/*" />
4+
5+
<!-- Ignoring the known prebuilts. -->
6+
7+
<!--
8+
These will go away when repo updates targeting to net8.0
9+
Tracked with https://github.com/dotnet/fsharp/issues/14765
10+
-->
11+
<UsagePattern IdentityGlob="Microsoft.AspNetCore.App.Ref/7.0.2" />
12+
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Host.linux-x64/7.0.2" />
13+
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Ref/7.0.2" />
14+
15+
<!-- Tracked in https://github.com/dotnet/source-build/issues/3438 -->
16+
<UsagePattern IdentityGlob="Microsoft.VisualStudio.Setup.Configuration.Interop/3.2.2146" />
417
</IgnorePatterns>
518
</UsageData>

‎eng/Version.Details.xml‎

Lines changed: 34 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,48 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.SourceBuild.Intermediate.xliff-tasks" Version="1.0.0-beta.21126.1">
4+
<Dependency Name="Microsoft.SourceBuild.Intermediate.xliff-tasks" Version="1.0.0-beta.23253.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
55
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
6-
<Sha>7e80445ee82adbf9a8e6ae601ac5e239d982afaa</Sha>
6+
<Sha>513000e77df5ec1f9b86397d8df6e3254703c636</Sha>
77
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
88
</Dependency>
9+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23262.1">
10+
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
11+
<Sha>d76c30028584fb1d02d9b27dc48e65ad87f4ecfe</Sha>
12+
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
13+
</Dependency>
14+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.7.0-preview-23217-02">
15+
<Uri>https://github.com/dotnet/msbuild</Uri>
16+
<Sha>2cbc8b6aef648cf21c6a68a0dab7fe09a614e475</Sha>
17+
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
18+
</Dependency>
19+
<Dependency Name="Microsoft.Build" Version="17.7.0-preview-23217-02">
20+
<Uri>https://github.com/dotnet/msbuild</Uri>
21+
<Sha>2cbc8b6aef648cf21c6a68a0dab7fe09a614e475</Sha>
22+
</Dependency>
23+
<Dependency Name="Microsoft.Build.Framework" Version="17.7.0-preview-23217-02">
24+
<Uri>https://github.com/dotnet/msbuild</Uri>
25+
<Sha>2cbc8b6aef648cf21c6a68a0dab7fe09a614e475</Sha>
26+
</Dependency>
27+
<Dependency Name="Microsoft.Build.Tasks.Core" Version="17.7.0-preview-23217-02">
28+
<Uri>https://github.com/dotnet/msbuild</Uri>
29+
<Sha>2cbc8b6aef648cf21c6a68a0dab7fe09a614e475</Sha>
30+
</Dependency>
31+
<Dependency Name="Microsoft.Build.Utilities.Core" Version="17.7.0-preview-23217-02">
32+
<Uri>https://github.com/dotnet/msbuild</Uri>
33+
<Sha>2cbc8b6aef648cf21c6a68a0dab7fe09a614e475</Sha>
34+
</Dependency>
935
</ProductDependencies>
1036
<ToolsetDependencies>
11-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22554.2">
37+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23255.2">
1238
<Uri>https://github.com/dotnet/arcade</Uri>
13-
<Sha>80b6be47e1425ea90c5febffac119250043a0c92</Sha>
39+
<Sha>5dff25b814b90abb85c847ed274cf4afb2c1b276</Sha>
1440
<SourceBuild RepoName="arcade" ManagedOnly="true" />
1541
</Dependency>
16-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.22554.2">
17-
<Uri>https://github.com/dotnet/arcade</Uri>
18-
<Sha>80b6be47e1425ea90c5febffac119250043a0c92</Sha>
42+
<Dependency Name="Microsoft.SourceLink.GitHub" Version="8.0.0-beta.23218.3" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
43+
<Uri>https://github.com/dotnet/sourcelink</Uri>
44+
<Sha>47c52dd2ebf9edfd40abdcff999c13eb461f6ce2</Sha>
45+
<SourceBuild RepoName="sourcelink" ManagedOnly="true" />
1946
</Dependency>
2047
</ToolsetDependencies>
2148
</Dependencies>

‎eng/Versions.props‎

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<!-- F# Version components -->
1616
<FSMajorVersion>7</FSMajorVersion>
1717
<FSMinorVersion>0</FSMinorVersion>
18-
<FSBuildVersion>300</FSBuildVersion>
18+
<FSBuildVersion>400</FSBuildVersion>
1919
<FSRevisionVersion>0</FSRevisionVersion>
2020
<!-- -->
2121
<!-- F# Language version -->
@@ -47,8 +47,7 @@
4747
<!-- -->
4848
<!-- FSharp tools for Visual Studio version number -->
4949
<FSToolsMajorVersion>12</FSToolsMajorVersion>
50-
51-
<FSToolsMinorVersion>5</FSToolsMinorVersion>
50+
<FSToolsMinorVersion>7</FSToolsMinorVersion>
5251
<FSToolsBuildVersion>0</FSToolsBuildVersion>
5352
<FSToolsRevisionVersion>$(FSRevisionVersion)</FSToolsRevisionVersion>
5453
<FSProductVersionPrefix>$(FSToolsMajorVersion).$(FSToolsMinorVersion).$(FSToolsBuildVersion)</FSProductVersionPrefix>
@@ -57,7 +56,7 @@
5756
</PropertyGroup>
5857
<PropertyGroup>
5958
<VSMajorVersion>17</VSMajorVersion>
60-
<VSMinorVersion>6</VSMinorVersion>
59+
<VSMinorVersion>7</VSMinorVersion>
6160
<VSGeneralVersion>$(VSMajorVersion).0</VSGeneralVersion>
6261
<VSAssemblyVersionPrefix>$(VSMajorVersion).$(VSMinorVersion).0</VSAssemblyVersionPrefix>
6362
<VSAssemblyVersion>$(VSAssemblyVersionPrefix).0</VSAssemblyVersion>
@@ -85,32 +84,31 @@
8584
https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json;
8685
https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json;
8786
https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json;
88-
https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7-transport/nuget/v3/index.json;
87+
https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json;
88+
https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json;
8989
https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json;
9090
https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk-archived/nuget/v3/index.json;
9191
https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl-archived/nuget/v3/index.json;
92-
9392
</RestoreSources>
9493
<!-- System.* packages -->
9594
<!-- If a System.* package is stuck on version 4.3.x, targets .NET Standard 1.x and hasn't been
9695
updated in years, you most likely DON'T need it, please exercise caution when adding it to the list. -->
9796
<SystemBuffersVersion>4.5.1</SystemBuffersVersion>
98-
<SystemCollectionsImmutableVersion>6.0.0</SystemCollectionsImmutableVersion>
97+
<SystemCollectionsImmutableVersion>7.0.0</SystemCollectionsImmutableVersion>
9998
<MicrosoftDiaSymReaderPortablePdbVersion>1.6.0</MicrosoftDiaSymReaderPortablePdbVersion>
100-
<SystemDiagnosticsDiagnosticSourceVersion>7.0.0</SystemDiagnosticsDiagnosticSourceVersion>
99+
<SystemDiagnosticsDiagnosticSourceVersion>7.0.2</SystemDiagnosticsDiagnosticSourceVersion>
101100
<SystemMemoryVersion>4.5.5</SystemMemoryVersion>
102101
<SystemReflectionEmitVersion>4.7.0</SystemReflectionEmitVersion>
103-
<SystemReflectionMetadataVersion>6.0.1</SystemReflectionMetadataVersion>
104-
<SystemThreadingTasksDataflow>4.11.1</SystemThreadingTasksDataflow>
102+
<SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
103+
<SystemThreadingTasksDataflow>7.0.0</SystemThreadingTasksDataflow>
105104
<SystemRuntimeCompilerServicesUnsafeVersion>6.0.0</SystemRuntimeCompilerServicesUnsafeVersion>
106105
<SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
107106
<!-- Versions for package groups -->
108107
<RoslynVersion>4.6.0-2.23126.2</RoslynVersion>
109-
<VisualStudioEditorPackagesVersion>17.5.274-preview</VisualStudioEditorPackagesVersion>
110-
<MicrosoftVisualStudioShellPackagesVersion>17.5.0-preview-2-33117-317</MicrosoftVisualStudioShellPackagesVersion>
111-
<VisualStudioProjectSystemPackagesVersion>17.5.202-pre-g89e17c9f72</VisualStudioProjectSystemPackagesVersion>
112-
<MicrosoftVisualStudioThreadingPackagesVersion>17.5.10-alpha</MicrosoftVisualStudioThreadingPackagesVersion>
113-
<MicrosoftBuildOverallPackagesVersion>17.5.0</MicrosoftBuildOverallPackagesVersion>
108+
<VisualStudioEditorPackagesVersion>17.7.25-preview</VisualStudioEditorPackagesVersion>
109+
<MicrosoftVisualStudioShellPackagesVersion>17.7.35338-preview.1</MicrosoftVisualStudioShellPackagesVersion>
110+
<VisualStudioProjectSystemPackagesVersion>17.7.58-pre</VisualStudioProjectSystemPackagesVersion>
111+
<MicrosoftVisualStudioThreadingPackagesVersion>17.7.5-preview</MicrosoftVisualStudioThreadingPackagesVersion>
114112
<!-- Roslyn packages -->
115113
<MicrosoftCodeAnalysisEditorFeaturesVersion>$(RoslynVersion)</MicrosoftCodeAnalysisEditorFeaturesVersion>
116114
<MicrosoftCodeAnalysisEditorFeaturesTextVersion>$(RoslynVersion)</MicrosoftCodeAnalysisEditorFeaturesTextVersion>
@@ -143,10 +141,10 @@
143141
<MicrosoftVisualStudioShellImmutable110Version>11.0.50727</MicrosoftVisualStudioShellImmutable110Version>
144142
<MicrosoftVisualStudioShellImmutable150Version>15.0.25123-Dev15Preview</MicrosoftVisualStudioShellImmutable150Version>
145143
<!-- Microsoft Build packages -->
146-
<MicrosoftBuildVersion>$(MicrosoftBuildOverallPackagesVersion)</MicrosoftBuildVersion>
147-
<MicrosoftBuildFrameworkVersion>$(MicrosoftBuildOverallPackagesVersion)</MicrosoftBuildFrameworkVersion>
148-
<MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildOverallPackagesVersion)</MicrosoftBuildTasksCoreVersion>
149-
<MicrosoftBuildUtilitiesCoreVersion>$(MicrosoftBuildOverallPackagesVersion)</MicrosoftBuildUtilitiesCoreVersion>
144+
<MicrosoftBuildVersion>17.7.0-preview-23217-02</MicrosoftBuildVersion>
145+
<MicrosoftBuildFrameworkVersion>17.7.0-preview-23217-02</MicrosoftBuildFrameworkVersion>
146+
<MicrosoftBuildTasksCoreVersion>17.7.0-preview-23217-02</MicrosoftBuildTasksCoreVersion>
147+
<MicrosoftBuildUtilitiesCoreVersion>17.7.0-preview-23217-02</MicrosoftBuildUtilitiesCoreVersion>
150148
<!-- Visual Studio Editor packages -->
151149
<MicrosoftVisualStudioCoreUtilityVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioCoreUtilityVersion>
152150
<MicrosoftVisualStudioEditorVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioEditorVersion>
@@ -170,10 +168,9 @@
170168
<MicrosoftVisualStudioProjectSystemManagedVersion>2.3.6152103</MicrosoftVisualStudioProjectSystemManagedVersion>
171169
<!-- Misc. Visual Studio packages -->
172170
<MicrosoftVSSDKBuildToolsVersion>17.1.4054</MicrosoftVSSDKBuildToolsVersion>
173-
<MicrosoftVisualStudioRpcContractsVersion>17.5.17-alpha</MicrosoftVisualStudioRpcContractsVersion>
171+
<MicrosoftVisualStudioRpcContractsVersion>17.7.3-preview</MicrosoftVisualStudioRpcContractsVersion>
174172
<MicrosoftVisualFSharpMicrosoftVisualStudioShellUIInternalVersion>17.0.0</MicrosoftVisualFSharpMicrosoftVisualStudioShellUIInternalVersion>
175-
<MicrosoftVisualStudioValidationVersion>17.0.71</MicrosoftVisualStudioValidationVersion>
176-
<SystemRuntimeCompilerServicesUnsafeVersion>6.0.0</SystemRuntimeCompilerServicesUnsafeVersion>
173+
<MicrosoftVisualStudioValidationVersion>17.6.11</MicrosoftVisualStudioValidationVersion>
177174
<VSSDKDebuggerVisualizersVersion>12.0.4</VSSDKDebuggerVisualizersVersion>
178175
<VSSDKVSLangProjVersion>7.0.4</VSSDKVSLangProjVersion>
179176
<VSSDKVSLangProj8Version>8.0.4</VSSDKVSLangProj8Version>
@@ -188,20 +185,21 @@
188185
<FsCheckVersion>2.16.5</FsCheckVersion>
189186
<FSharpDataTypeProvidersVersion>4.3.0.0</FSharpDataTypeProvidersVersion>
190187
<MicrosoftCompositionVersion>1.0.31</MicrosoftCompositionVersion>
191-
<SystemComponentModelCompositionVersion>6.0.0</SystemComponentModelCompositionVersion>
188+
<SystemComponentModelCompositionVersion>7.0.0</SystemComponentModelCompositionVersion>
189+
<SystemCompositionVersion>7.0.0</SystemCompositionVersion>
192190
<MicrosoftMSXMLVersion>8.0.0</MicrosoftMSXMLVersion>
193191
<MicrosoftNetCompilersVersion>4.3.0-1.22220.8</MicrosoftNetCompilersVersion>
194192
<MicrosoftNETCoreAppRefVersion>3.1.0</MicrosoftNETCoreAppRefVersion>
195193
<MicrosoftNETCoreILDAsmVersion>5.0.0-preview.7.20364.11</MicrosoftNETCoreILDAsmVersion>
196194
<MicrosoftNETCoreILAsmVersion>5.0.0-preview.7.20364.11</MicrosoftNETCoreILAsmVersion>
197195
<MicrosoftNETTestSdkVersion>17.4.0</MicrosoftNETTestSdkVersion>
198-
<NewtonsoftJsonVersion>13.0.2</NewtonsoftJsonVersion>
196+
<NewtonsoftJsonVersion>13.0.3</NewtonsoftJsonVersion>
199197
<NUnitVersion>3.13.2</NUnitVersion>
200198
<NUnit3TestAdapterVersion>4.1.0</NUnit3TestAdapterVersion>
201199
<NUnitLiteVersion>3.11.0</NUnitLiteVersion>
202200
<NunitXmlTestLoggerVersion>2.1.80</NunitXmlTestLoggerVersion>
203201
<RoslynToolsSignToolVersion>1.0.0-beta2-dev3</RoslynToolsSignToolVersion>
204-
<StreamJsonRpcVersion>2.14.20</StreamJsonRpcVersion>
202+
<StreamJsonRpcVersion>2.16.8-preview</StreamJsonRpcVersion>
205203
<NerdbankStreamsVersion>2.9.112</NerdbankStreamsVersion>
206204
<XUnitVersion>2.4.1</XUnitVersion>
207205
<XUnitRunnerVersion>2.4.2</XUnitRunnerVersion>

‎eng/common/BuildConfiguration/build-configuration.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"RetryCountLimit": 1,
3+
"RetryByAnyError": false
4+
}

‎eng/common/cross/arm/sources.list.xenial‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ deb http://ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted
88
deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted
99

1010
deb http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse
11-
deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse
11+
deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted universe multiverse

‎eng/common/cross/arm/tizen-build-rootfs.sh‎

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)