未验证 提交 21917054 编写于 作者: D dotnet bot 提交者: GitHub

Merge pull request #13101 from dotnet/merges/release/dev17.2-to-release/dev17.3

Merge release/dev17.2 to release/dev17.3
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<!-- F# Version components --> <!-- F# Version components -->
<FSMajorVersion>6</FSMajorVersion> <FSMajorVersion>6</FSMajorVersion>
<FSMinorVersion>0</FSMinorVersion> <FSMinorVersion>0</FSMinorVersion>
<FSBuildVersion>4</FSBuildVersion> <FSBuildVersion>5</FSBuildVersion>
<FSRevisionVersion>0</FSRevisionVersion> <FSRevisionVersion>0</FSRevisionVersion>
<!-- --> <!-- -->
<!-- F# Language version --> <!-- F# Language version -->
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<!-- FSharp.Compiler.Service version --> <!-- FSharp.Compiler.Service version -->
<FCSMajorVersion>41</FCSMajorVersion> <FCSMajorVersion>41</FCSMajorVersion>
<FCSMinorVersion>0</FCSMinorVersion> <FCSMinorVersion>0</FCSMinorVersion>
<FCSBuildVersion>4</FCSBuildVersion> <FCSBuildVersion>5</FCSBuildVersion>
<FCSRevisionVersion>$(FSRevisionVersion)</FCSRevisionVersion> <FCSRevisionVersion>$(FSRevisionVersion)</FCSRevisionVersion>
<FSharpCompilerServicePackageVersion>$(FCSMajorVersion).$(FCSMinorVersion).$(FCSBuildVersion)</FSharpCompilerServicePackageVersion> <FSharpCompilerServicePackageVersion>$(FCSMajorVersion).$(FCSMinorVersion).$(FCSBuildVersion)</FSharpCompilerServicePackageVersion>
<FSharpCompilerServiceVersion>$(FCSMajorVersion).$(FCSMinorVersion).$(FCSBuildVersion).$(FCSRevisionVersion)</FSharpCompilerServiceVersion> <FSharpCompilerServiceVersion>$(FCSMajorVersion).$(FCSMinorVersion).$(FCSBuildVersion).$(FCSRevisionVersion)</FSharpCompilerServiceVersion>
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
<!-- FSharp tools for Visual Studio version number --> <!-- FSharp tools for Visual Studio version number -->
<FSToolsMajorVersion>12</FSToolsMajorVersion> <FSToolsMajorVersion>12</FSToolsMajorVersion>
<FSToolsMinorVersion>0</FSToolsMinorVersion> <FSToolsMinorVersion>0</FSToolsMinorVersion>
<FSToolsBuildVersion>3</FSToolsBuildVersion> <FSToolsBuildVersion>4</FSToolsBuildVersion>
<FSToolsRevisionVersion>$(FSRevisionVersion)</FSToolsRevisionVersion> <FSToolsRevisionVersion>$(FSRevisionVersion)</FSToolsRevisionVersion>
<FSProductVersionPrefix>$(FSToolsMajorVersion).$(FSToolsMinorVersion).$(FSToolsBuildVersion)</FSProductVersionPrefix> <FSProductVersionPrefix>$(FSToolsMajorVersion).$(FSToolsMinorVersion).$(FSToolsBuildVersion)</FSProductVersionPrefix>
<FSProductVersionReleaseNotesVersion>$(FSToolsMajorVersion)-$(FSToolsMinorVersion)-$(FSToolsBuildVersion)</FSProductVersionReleaseNotesVersion> <FSProductVersionReleaseNotesVersion>$(FSToolsMajorVersion)-$(FSToolsMinorVersion)-$(FSToolsBuildVersion)</FSProductVersionReleaseNotesVersion>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册