Skip to content

Commit eec3561

Browse files
brettfobrettfo
authored
Merge pull request #9243 from dotnet/merges/release/dev16.6-to-master
Merge release/dev16.6 to master
2 parents 596f3d7 + 9a54125 commit eec3561

77 files changed

Lines changed: 410 additions & 370 deletions

File tree

Some content is hidden

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

‎azure-pipelines.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ stages:
446446
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
447447
- template: eng/release/insert-into-vs.yml
448448
parameters:
449-
componentBranchName: refs/heads/release/dev16.5
450-
insertTargetBranch: rel/d16.5
449+
componentBranchName: refs/heads/release/dev16.6
450+
insertTargetBranch: rel/d16.6
451451
insertTeamEmail: fsharpteam@microsoft.com
452452
insertTeamName: 'F#'

‎eng/Versions.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@
2323
<FSharpCorePreviewPackageVersion>$(FSCorePackageVersion)-$(PreReleaseVersionLabel).*</FSharpCorePreviewPackageVersion>
2424
</PropertyGroup>
2525
<PropertyGroup>
26-
<FSPackageMajorVersion>10.8</FSPackageMajorVersion>
26+
<FSPackageMajorVersion>10.9</FSPackageMajorVersion>
2727
<FSPackageVersion>$(FSPackageMajorVersion).1</FSPackageVersion>
2828
<FSProductVersionPrefix>$(FSPackageVersion)</FSProductVersionPrefix>
2929
<FSProductVersion>$(FSPackageVersion).0</FSProductVersion>
3030
</PropertyGroup>
3131
<PropertyGroup>
3232
<VSMajorVersion>16</VSMajorVersion>
33-
<VSMinorVersion>5</VSMinorVersion>
33+
<VSMinorVersion>6</VSMinorVersion>
3434
<VSGeneralVersion>$(VSMajorVersion).0</VSGeneralVersion>
3535
<VSAssemblyVersionPrefix>$(VSMajorVersion).$(VSMinorVersion).0</VSAssemblyVersionPrefix>
3636
<VSAssemblyVersion>$(VSAssemblyVersionPrefix).0</VSAssemblyVersion>

‎eng/common/dotnet-install.sh‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
1414
version='Latest'
1515
architecture=''
1616
runtime='dotnet'
17-
runtimeSourceFeed=''
18-
runtimeSourceFeedKey=''
1917
while [[ $# > 0 ]]; do
2018
opt="$(echo "$1" | awk '{print tolower($0)}')"
2119
case "$opt" in
@@ -31,14 +29,6 @@ while [[ $# > 0 ]]; do
3129
shift
3230
runtime="$1"
3331
;;
34-
-runtimesourcefeed)
35-
shift
36-
runtimeSourceFeed="$1"
37-
;;
38-
-runtimesourcefeedkey)
39-
shift
40-
runtimeSourceFeedKey="$1"
41-
;;
4232
*)
4333
echo "Invalid argument: $1"
4434
exit 1

‎setup/Swix/Microsoft.FSharp.IDE/Microsoft.FSharp.IDE.csproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
<_Dependency Include="FSharp.Build" Version="$(FSProductVersion)" />
1818
<_Dependency Include="FSharp.Compiler.Interactive.Settings" Version="$(FSProductVersion)" />
1919
<_Dependency Include="FSharp.Compiler.Private" Version="$(FSProductVersion)" />
20+
<_Dependency Include="Microsoft.DotNet.DependencyManager" Version="$(FSProductVersion)" />
21+
<_Dependency Include="FSharp.DependencyManager.Nuget" Version="$(FSProductVersion)" />
2022
<_Dependency Include="FSharp.Compiler.Server.Shared" Version="$(FSProductVersion)" />
2123
<_Dependency Include="FSharp.Core" Version="$(FSCoreVersion)" />
2224
<_Dependency Include="FSharp.Editor" Version="$(VSAssemblyVersion)" />

‎src/absil/bytes.fs‎

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -314,21 +314,26 @@ type ByteMemory with
314314

315315
member x.AsReadOnly() = ReadOnlyByteMemory x
316316

317+
static member Empty = ByteArrayMemory([||], 0, 0) :> ByteMemory
318+
317319
static member CreateMemoryMappedFile(bytes: ReadOnlyByteMemory) =
318-
if Utils.runningOnMono
319-
then
320-
// mono's MemoryMappedFile implementation throws with null `mapName`, so we use byte arrays instead: https://github.com/mono/mono/issues/10245
321-
ByteArrayMemory.FromArray (bytes.ToArray()) :> ByteMemory
320+
let length = int64 bytes.Length
321+
if length = 0L then
322+
ByteMemory.Empty
322323
else
323-
let length = int64 bytes.Length
324-
let mmf =
325-
let mmf = MemoryMappedFile.CreateNew(null, length, MemoryMappedFileAccess.ReadWrite, MemoryMappedFileOptions.None, HandleInheritability.None)
326-
use stream = mmf.CreateViewStream(0L, length, MemoryMappedFileAccess.ReadWrite)
327-
bytes.CopyTo stream
328-
mmf
329-
330-
let accessor = mmf.CreateViewAccessor(0L, length, MemoryMappedFileAccess.ReadWrite)
331-
RawByteMemory.FromUnsafePointer(accessor.SafeMemoryMappedViewHandle.DangerousGetHandle(), int length, (mmf, accessor))
324+
if Utils.runningOnMono
325+
then
326+
// mono's MemoryMappedFile implementation throws with null `mapName`, so we use byte arrays instead: https://github.com/mono/mono/issues/10245
327+
ByteArrayMemory.FromArray (bytes.ToArray()) :> ByteMemory
328+
else
329+
let mmf =
330+
let mmf = MemoryMappedFile.CreateNew(null, length, MemoryMappedFileAccess.ReadWrite, MemoryMappedFileOptions.None, HandleInheritability.None)
331+
use stream = mmf.CreateViewStream(0L, length, MemoryMappedFileAccess.ReadWrite)
332+
bytes.CopyTo stream
333+
mmf
334+
335+
let accessor = mmf.CreateViewAccessor(0L, length, MemoryMappedFileAccess.ReadWrite)
336+
RawByteMemory.FromUnsafePointer(accessor.SafeMemoryMappedViewHandle.DangerousGetHandle(), int length, (mmf, accessor))
332337

333338
static member FromFile(path, access, ?canShadowCopy: bool) =
334339
let canShadowCopy = defaultArg canShadowCopy false

‎src/absil/bytes.fsi‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,11 @@ type ByteMemory with
8888

8989
member AsReadOnly: unit -> ReadOnlyByteMemory
9090

91+
/// Empty byte memory.
92+
static member Empty: ByteMemory
93+
9194
/// Create another ByteMemory object that has a backing memory mapped file based on another ByteMemory's contents.
95+
/// If the given ByteMemory's length is zero, a backing memory mapped file will not be created and an empty ByteMemory will be given.
9296
static member CreateMemoryMappedFile: ReadOnlyByteMemory -> ByteMemory
9397

9498
/// Creates a ByteMemory object that has a backing memory mapped file from a file on-disk.

‎src/fsharp/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.cs.xlf‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@
44
<body>
55
<trans-unit id="cantReferenceSystemPackage">
66
<source>PackageManager can not reference the System Package '{0}'</source>
7-
<target state="new">PackageManager can not reference the System Package '{0}'</target>
7+
<target state="translated">PackageManager se nemůže odkazovat na systémový balíček {0}.</target>
88
<note />
99
</trans-unit>
1010
<trans-unit id="notUsed">
1111
<source>Not used.</source>
12-
<target state="new">Not used.</target>
12+
<target state="translated">Nepoužito</target>
1313
<note />
1414
</trans-unit>
1515
<trans-unit id="requiresAValue">
1616
<source>{0} requires a value</source>
17-
<target state="new">{0} requires a value</target>
17+
<target state="translated">{0} vyžaduje hodnotu.</target>
1818
<note />
1919
</trans-unit>
2020
<trans-unit id="unableToApplyImplicitArgument">
2121
<source>Unable to apply implicit argument number {0}</source>
22-
<target state="new">Unable to apply implicit argument number {0}</target>
22+
<target state="translated">Nepovedlo se použít implicitní počet argumentů {0}.</target>
2323
<note />
2424
</trans-unit>
2525
</body>

‎src/fsharp/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.de.xlf‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@
44
<body>
55
<trans-unit id="cantReferenceSystemPackage">
66
<source>PackageManager can not reference the System Package '{0}'</source>
7-
<target state="new">PackageManager can not reference the System Package '{0}'</target>
7+
<target state="translated">PackageManager kann nicht auf das Systempaket "{0}" verweisen.</target>
88
<note />
99
</trans-unit>
1010
<trans-unit id="notUsed">
1111
<source>Not used.</source>
12-
<target state="new">Not used.</target>
12+
<target state="translated">Nicht verwendet.</target>
1313
<note />
1414
</trans-unit>
1515
<trans-unit id="requiresAValue">
1616
<source>{0} requires a value</source>
17-
<target state="new">{0} requires a value</target>
17+
<target state="translated">Für "{0}" ist ein Wert erforderlich.</target>
1818
<note />
1919
</trans-unit>
2020
<trans-unit id="unableToApplyImplicitArgument">
2121
<source>Unable to apply implicit argument number {0}</source>
22-
<target state="new">Unable to apply implicit argument number {0}</target>
22+
<target state="translated">Die Zahl für das implizierte Argument ({0}) kann nicht angewendet werden.</target>
2323
<note />
2424
</trans-unit>
2525
</body>

‎src/fsharp/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.es.xlf‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@
44
<body>
55
<trans-unit id="cantReferenceSystemPackage">
66
<source>PackageManager can not reference the System Package '{0}'</source>
7-
<target state="new">PackageManager can not reference the System Package '{0}'</target>
7+
<target state="translated">PackageManager no puede hacer referencia al paquete del sistema "{0}".</target>
88
<note />
99
</trans-unit>
1010
<trans-unit id="notUsed">
1111
<source>Not used.</source>
12-
<target state="new">Not used.</target>
12+
<target state="translated">No utilizado.</target>
1313
<note />
1414
</trans-unit>
1515
<trans-unit id="requiresAValue">
1616
<source>{0} requires a value</source>
17-
<target state="new">{0} requires a value</target>
17+
<target state="translated">{0} requiere un valor</target>
1818
<note />
1919
</trans-unit>
2020
<trans-unit id="unableToApplyImplicitArgument">
2121
<source>Unable to apply implicit argument number {0}</source>
22-
<target state="new">Unable to apply implicit argument number {0}</target>
22+
<target state="translated">No se puede aplicar el número de argumento implícito {0}.</target>
2323
<note />
2424
</trans-unit>
2525
</body>

‎src/fsharp/FSharp.DependencyManager.Nuget/xlf/FSDependencyManager.txt.fr.xlf‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@
44
<body>
55
<trans-unit id="cantReferenceSystemPackage">
66
<source>PackageManager can not reference the System Package '{0}'</source>
7-
<target state="new">PackageManager can not reference the System Package '{0}'</target>
7+
<target state="translated">PackageManager ne peut pas référencer le package système '{0}'</target>
88
<note />
99
</trans-unit>
1010
<trans-unit id="notUsed">
1111
<source>Not used.</source>
12-
<target state="new">Not used.</target>
12+
<target state="translated">Non utilisé.</target>
1313
<note />
1414
</trans-unit>
1515
<trans-unit id="requiresAValue">
1616
<source>{0} requires a value</source>
17-
<target state="new">{0} requires a value</target>
17+
<target state="translated">{0} nécessite une valeur</target>
1818
<note />
1919
</trans-unit>
2020
<trans-unit id="unableToApplyImplicitArgument">
2121
<source>Unable to apply implicit argument number {0}</source>
22-
<target state="new">Unable to apply implicit argument number {0}</target>
22+
<target state="translated">Impossible d'appliquer le numéro d'argument implicite {0}</target>
2323
<note />
2424
</trans-unit>
2525
</body>

0 commit comments

Comments
 (0)