Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-dotnet -->
<add key="darc-pub-dotnet-dotnet-d7437ff" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-d7437ff1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-dotnet -->
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<!-- End: Package sources from DotNet-msbuild-Trusted -->
Expand Down
7 changes: 7 additions & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,8 @@ extends:
variables:
- name: _SignType
value: Real
- name: BclPackageVersion
value: '10.0.13'
steps:
- checkout: self
clean: true
Expand All @@ -143,6 +145,11 @@ extends:
/p:OfficialBuildId=$(BUILD.BUILDNUMBER)
/p:VisualStudioDropName=$(VisualStudioDropName)
/p:GenerateSbom=true
/p:SystemCollectionsImmutablePackageVersion=$(BclPackageVersion)
/p:SystemCompositionPackageVersion=$(BclPackageVersion)
/p:SystemDiagnosticsDiagnosticSourcePackageVersion=$(BclPackageVersion)
/p:SystemReflectionMetadataPackageVersion=$(BclPackageVersion)
/p:SystemSecurityCryptographyXmlPackageVersion=$(BclPackageVersion)
env:
NativeToolsOnMachine: true
FSHARP_CACHE_OVERRIDE: 256
Expand Down
2 changes: 1 addition & 1 deletion eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="fsharp" Sha="ee344f85ef890dd92974e9b93d75906f1f8c39f3" BarId="337683" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="fsharp" Sha="1b216daefee8ecc5091e7087eb8c0ab16640a208" BarId="338948" />
<ProductDependencies>
<Dependency Name="Microsoft.Build" Version="18.13.0-1.26516.14">
<Uri>https://github.com/dotnet/msbuild</Uri>
Expand Down
2 changes: 1 addition & 1 deletion src/Compiler/Checking/Expressions/CheckExpressions.fs
Original file line number Diff line number Diff line change
Expand Up @@ -13755,4 +13755,4 @@ let TcAndPublishValSpec (cenv: cenv, env, containerInfo: ContainerInfo, declKind

assert(vspec.InlineInfo = inlineFlag)

vspec, tpenv)
vspec, tpenv)
2 changes: 1 addition & 1 deletion src/Compiler/xlf/FSComp.txt.cs.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/Compiler/xlf/FSComp.txt.de.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/Compiler/xlf/FSComp.txt.es.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/Compiler/xlf/FSComp.txt.fr.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/Compiler/xlf/FSComp.txt.it.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/Compiler/xlf/FSComp.txt.ja.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/Compiler/xlf/FSComp.txt.ko.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/Compiler/xlf/FSComp.txt.pl.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/Compiler/xlf/FSComp.txt.pt-BR.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/Compiler/xlf/FSComp.txt.ru.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/Compiler/xlf/FSComp.txt.tr.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/Compiler/xlf/FSComp.txt.zh-Hans.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/Compiler/xlf/FSComp.txt.zh-Hant.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -258,4 +258,4 @@ IL_0021: ldloc.1
IL_0022: callvirt instance class [runtime]System.Text.StringBuilder [runtime]System.Text.StringBuilder::Append(valuetype [runtime]System.ReadOnlySpan`1<char>)
IL_0027: stloc.2
IL_0028: ldc.i4.0
IL_0029: ret"""]
IL_0029: ret"""]
Original file line number Diff line number Diff line change
Expand Up @@ -1335,4 +1335,4 @@ let a = MyClass()
|> Array.sort
Assert.Equal<(int * int * int) array>(
[| (4, 4, 7); (6, 8, 15) |],
rawUses))
rawUses))
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
PLEASE READ

Please remove this file during conflict resolution in your PR.
This file has been reverted (removed) in the source repository but the PR branch
does not have the file yet as it's based on an older commit. This means the file is
not getting removed in the PR due to the other conflicts.
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
PLEASE READ

Please remove this file during conflict resolution in your PR.
This file has been reverted (removed) in the source repository but the PR branch
does not have the file yet as it's based on an older commit. This means the file is
not getting removed in the PR due to the other conflicts.
Original file line number Diff line number Diff line change
Expand Up @@ -1637,4 +1637,4 @@ let runAllTests () =
testTaskUsesSyncContext ()
testExceptionAttachedToTaskWithoutAwait ()
testExceptionAttachedToTaskWithAwait ()
0
0
Original file line number Diff line number Diff line change
Expand Up @@ -12757,4 +12757,4 @@ Internal.Utilities.Library.InterruptibleLazy`1[T]: Internal.Utilities.Library.In
Internal.Utilities.Library.InterruptibleLazy`1[T]: T Force()
Internal.Utilities.Library.InterruptibleLazy`1[T]: T Value
Internal.Utilities.Library.InterruptibleLazy`1[T]: T get_Value()
Internal.Utilities.Library.InterruptibleLazy`1[T]: Void .ctor(Microsoft.FSharp.Core.FSharpFunc`2[Microsoft.FSharp.Core.Unit,T])
Internal.Utilities.Library.InterruptibleLazy`1[T]: Void .ctor(Microsoft.FSharp.Core.FSharpFunc`2[Microsoft.FSharp.Core.Unit,T])
Original file line number Diff line number Diff line change
Expand Up @@ -2740,4 +2740,4 @@ Microsoft.FSharp.Reflection.UnionCaseInfo: System.String Name
Microsoft.FSharp.Reflection.UnionCaseInfo: System.String ToString()
Microsoft.FSharp.Reflection.UnionCaseInfo: System.String get_Name()
Microsoft.FSharp.Reflection.UnionCaseInfo: System.Type DeclaringType
Microsoft.FSharp.Reflection.UnionCaseInfo: System.Type get_DeclaringType()
Microsoft.FSharp.Reflection.UnionCaseInfo: System.Type get_DeclaringType()
Original file line number Diff line number Diff line change
Expand Up @@ -2739,4 +2739,4 @@ Microsoft.FSharp.Reflection.UnionCaseInfo: System.String Name
Microsoft.FSharp.Reflection.UnionCaseInfo: System.String ToString()
Microsoft.FSharp.Reflection.UnionCaseInfo: System.String get_Name()
Microsoft.FSharp.Reflection.UnionCaseInfo: System.Type DeclaringType
Microsoft.FSharp.Reflection.UnionCaseInfo: System.Type get_DeclaringType()
Microsoft.FSharp.Reflection.UnionCaseInfo: System.Type get_DeclaringType()
2 changes: 1 addition & 1 deletion vsintegration/src/FSharp.Editor/FSharp.Editor.resx
Original file line number Diff line number Diff line change
Expand Up @@ -373,4 +373,4 @@ Use live (unsaved) buffers for analysis</value>
{2}</value>
<comment>Tooltip of an F# declaration in the Copilot Chat "#" picker, as Copilot shows a C# one. {0} is the kind of declaration (Class, Method, Field...), {1} the file name, {2} the declaration's name.</comment>
</data>
</root>
</root>
2 changes: 1 addition & 1 deletion vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.cs.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.de.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.es.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.fr.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.it.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.ja.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.ko.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.pl.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.ru.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vsintegration/src/FSharp.Editor/xlf/FSharp.Editor.tr.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading