Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge dev16.0 to dev16.1 #6253

Merged
merged 13 commits into from
Feb 19, 2019
Merged
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
5 changes: 2 additions & 3 deletions build/config/AssemblySignToolData.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"certificate": "VsixSHA2",
"strongName": null,
"values": [
"bin\\VisualFSharpFull\\*\\*VisualFSharpFull.vsix",
"bin\\VisualFSharpFull\\*\\*\\VisualFSharpFull.vsix",
"bin\\VisualFSharpTemplates\\*\\*\\VisualFSharpTemplate.vsix",
"VSSetup\\*\\Insertion\\Microsoft.FSharp.Dependencies.vsix",
"VSSetup\\*\\Insertion\\Microsoft.FSharp.VSIX.Full.Resources.*.vsix"
Expand All @@ -49,8 +49,7 @@
"certificate": "NuGet",
"strongName": null,
"values": [
"artifacts\\*.nupkg",
"artifacts\\*\\*.nupkg"
"packages\\*\\*.nupkg"
]
}
],
Expand Down
6 changes: 3 additions & 3 deletions build/targets/AssemblyVersions.props
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@

<FSLanguageVersion>4.6</FSLanguageVersion>
<FSCoreMajorVersion>$(FSLanguageVersion)</FSCoreMajorVersion>
<FSCorePackageVersion>$(FSCoreMajorVersion).1</FSCorePackageVersion>
<FSCorePackageVersion>$(FSCoreMajorVersion).2</FSCorePackageVersion>
<FSCoreVersion>$(FSCoreMajorVersion).0.0</FSCoreVersion>

<FSPackageMajorVersion>10.4</FSPackageMajorVersion>
<FSPackageVersion>$(FSPackageMajorVersion).1</FSPackageVersion>
<FSPackageVersion>$(FSPackageMajorVersion).2</FSPackageVersion>
<FSProductVersion>$(FSPackageMajorVersion).0.0</FSProductVersion>

<VSMajorVersion>16</VSMajorVersion>
<VSMinorVersion>1</VSMinorVersion>
<VSMinorVersion>0</VSMinorVersion>
<VSGeneralVersion>$(VSMajorVersion).0</VSGeneralVersion>
<VSAssemblyVersion>$(VSMajorVersion).$(VSMinorVersion).0.0</VSAssemblyVersion>

Expand Down
4 changes: 2 additions & 2 deletions build/targets/NGenOrCrossGen.targets
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
NGen for both 32 and 64 bit product.
If compiling use the app config file, if present.
-->
<Exec Command='"$(PathToNGen64)" install "$(TargetPath)" /ExeConfig:$(TargetPath)' Condition = "Exists('$(PathToNGen64)') AND Exists('$(TargetPath).config') AND '$(IsAdministrator)' == 'true'"/>
<Exec Command='"$(PathToNGen64)" install "$(TargetPath)" /ExeConfig:$(TargetPath)' Condition = "Exists('$(PathToNGen64)') AND Exists('$(TargetPath).config') AND '$(IsAdministrator)' == 'true' AND '$(PlatformTarget)' != 'x86'"/>
<Exec Command='"$(PathToNGen32)" install "$(TargetPath)" /ExeConfig:$(TargetPath)' Condition = "Exists('$(PathToNGen32)') AND Exists('$(TargetPath).config') AND '$(IsAdministrator)' == 'true'"/>
<Exec Command='"$(PathToNGen64)" install "$(TargetPath)"' Condition = " Exists('$(PathToNGen64)') AND (!Exists('$(TargetPath).config')) AND '$(IsAdministrator)' == 'true' "/>
<Exec Command='"$(PathToNGen64)" install "$(TargetPath)"' Condition = " Exists('$(PathToNGen64)') AND (!Exists('$(TargetPath).config')) AND '$(IsAdministrator)' == 'true' AND '$(PlatformTarget)' != 'x86' "/>
<Exec Command='"$(PathToNGen32)" install "$(TargetPath)"' Condition = " Exists('$(PathToNGen32)') AND (!Exists('$(TargetPath).config')) AND '$(IsAdministrator)' == 'true' "/>
</Target>

Expand Down
22 changes: 13 additions & 9 deletions fsharp.proj
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
<BuildFCS Condition="'$(BUILD_FCS)' == '1'">true</BuildFCS>
<BuildNuget Condition="'$(BUILD_NUGET)' == '1' or '$(BUILD_SETUP)' == '1'">true</BuildNuget>
<BuildSetup Condition="'$(BUILD_SETUP)' == '1'">true</BuildSetup>
<BuildNuget Condition="'$(BUILD_NUGET)' == '1'">true</BuildNuget>

<TestCompiler Condition="'$(TEST_NET40_COMPILERUNIT_SUITE)' == '1'">true</TestCompiler>
<TestCompiler Condition="'$(TEST_CORECLR_COREUNIT_SUITE)' == '1'">true</TestCompiler>
Expand Down Expand Up @@ -91,10 +90,11 @@
<Projects Include="$(MSBuildThisFileDirectory)vsintegration\Utils\LanguageServiceProfiling\LanguageServiceProfiling.fsproj" />
<Projects Include="$(MSBuildThisFileDirectory)vsintegration\fsharp-vsintegration-item-templates-build.proj" />
<Projects Include="$(MSBuildThisFileDirectory)vsintegration\fsharp-vsintegration-project-templates-build.proj" />
<Projects Include="$(MSBuildThisFileDirectory)vsintegration\fsharp-vsintegration-vsix-build.proj" />
<VsixProjects Include="$(MSBuildThisFileDirectory)\vsintegration\Vsix\VisualFSharpFull\VisualFSharpFull.csproj" />
<VsixProjects Include="$(MSBuildThisFileDirectory)\vsintegration\Vsix\VisualFSharpTemplates\VisualFSharpTemplates.csproj" />
</ItemGroup>

<ItemGroup Condition="'$(BuildCompiler)' == 'true' OR '$(BuildNuget)' == 'true' OR '$(BuildVS)' == 'true' OR'$(_RunningRestore)' == 'true'">
<ItemGroup Condition="'$(BuildCompiler)' == 'true' OR '$(BuildNuget)' == 'true' OR '$(BuildVS)' == 'true' OR '$(_RunningRestore)' == 'true'">
<NugetProjects Include="src\fsharp\FSharp.Core\FSharp.Core.fsproj" />
</ItemGroup>

Expand All @@ -111,7 +111,7 @@
</ItemGroup>

<ItemGroup Condition="'$(BuildSetup)' == 'true' OR '$(_RunningRestore)' == 'true'">
<Projects Include="$(MSBuildThisFileDirectory)setup\fsharp-setup-build.csproj" />
<SetupProjects Include="$(MSBuildThisFileDirectory)setup\fsharp-setup-build.csproj" />
</ItemGroup>

<!-- test binaries -->
Expand Down Expand Up @@ -155,21 +155,25 @@
</Target>

<Target Name="Build" DependsOnTargets="CollectProjects">
<!-- Nuget projects need to be built before the vsix stuff, so that the vsix build -->
<MSBuild Projects="@(NugetProjects);@(Projects)" Targets="Build" Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);$(CustomProps)" />
<MSBuild Projects="@(NugetProjects)" Targets="Pack" Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);$(CustomProps)" />
<MSBuild Projects="@(Projects);@(NugetProjects)" Targets="Build" Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);$(CustomProps)" />
<MSBuild Projects="@(VsixProjects)" Targets="Build" Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);$(CustomProps)" />
<MSBuild Projects="@(SetupProjects)" Targets="Build" Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);$(CustomProps)" />
</Target>

<Target Name="Rebuild" DependsOnTargets="CollectProjects">
<MSBuild Projects="@(Projects);@(NugetProjects)" Targets="Rebuild" Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);$(CustomProps)" />
<MSBuild Projects="@(NugetProjects);@(Projects)" Targets="Rebuild" Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);$(CustomProps)" />
<MSBuild Projects="@(NugetProjects)" Targets="Pack" Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);$(CustomProps)" />
<MSBuild Projects="@(VsixProjects)" Targets="Rebuild" Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);$(CustomProps)" />
<MSBuild Projects="@(SetupProjects)" Targets="Rebuild" Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);$(CustomProps)" />
</Target>

<Target Name="Clean" DependsOnTargets="CollectProjects">
<MSBuild Projects="@(Projects);@(NugetProjects)" Targets="Clean" Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);$(CustomProps)" />
<MSBuild Projects="@(Projects);@(NugetProjects);@(VsixProjects);@(SetupProjects)" Targets="Clean" Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);$(CustomProps)" />
</Target>

<Target Name="Restore" DependsOnTargets="_BeforeRestore;CollectProjects">
<MSBuild Projects="@(Projects);@(NugetProjects)" Targets="Restore" Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);$(CustomProps)" />
<MSBuild Projects="@(Projects);@(NugetProjects);@(VsixProjects);@(SetupProjects)" Targets="Restore" Properties="Configuration=$(Configuration);BUILD_PUBLICSIGN=$(BUILD_PUBLICSIGN);$(CustomProps)" />
</Target>

</Project>
8 changes: 4 additions & 4 deletions setup/Swix/Microsoft.FSharp.vsmanproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
</PropertyGroup>

<ItemGroup>
<InsertionItems Include="$(VsixBuildLocation)\VisualFSharpFull.vsix" />
<InsertionItems Include="$(VsixBuildLocation)\VisualFSharpTemplate.vsix" />
<InsertionItems Include="$(VsixBuildLocation)\Microsoft.FSharp.VSIX.Full.Core.json" />
<InsertionItems Include="$(VsixBuildLocation)\Microsoft.FSharp.VSIX.Templates.json" />
<InsertionItems Include="$(ArtifactsDir)\bin\VisualFSharpFull\$(Configuration)\net472\VisualFSharpFull.vsix" />
<InsertionItems Include="$(ArtifactsDir)\bin\VisualFSharpFull\$(Configuration)\net472\Microsoft.FSharp.VSIX.Full.Core.json" />
<InsertionItems Include="$(ArtifactsDir)\bin\VisualFSharpTemplates\$(Configuration)\net472\VisualFSharpTemplate.vsix" />
<InsertionItems Include="$(ArtifactsDir)\bin\VisualFSharpTemplates\$(Configuration)\net472\Microsoft.FSharp.VSIX.Templates.json" />
</ItemGroup>

<Target Name="CopyInsertionItems">
Expand Down
12 changes: 0 additions & 12 deletions setup/fsharp-setup-build.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,6 @@
</ItemGroup>

<Target Name="CollectSetupProjects">
<ItemGroup>
<VsixProjects Include="VisualFSharpFull.csproj">
<ProjectPath>..\vsintegration\Vsix\VisualFSharpFull\VisualFSharpFull.csproj</ProjectPath>
</VsixProjects>
<VsixProjects Include="VisualFSharpTemplates.csproj">
<ProjectPath>..\vsintegration\Vsix\VisualFSharpTemplates\VisualFSharpTemplates.csproj</ProjectPath>
</VsixProjects>
</ItemGroup>

<CreateItem Include="@(SetupLanguages)"
AdditionalMetadata="ProjectPath=Swix\Microsoft.FSharp.Vsix.Resources\Microsoft.FSharp.Vsix.Resources.swixproj">
<Output ItemName="SwixSetupProjects" TaskParameter="Include" />
Expand Down Expand Up @@ -59,9 +50,6 @@
<PropertyGroup>
<CustomProps>AssemblySearchPaths={HintPathFromItem};{TargetFrameworkDirectory};{RawFileName}</CustomProps>
</PropertyGroup>
<MSBuild Projects="%(VsixProjects.ProjectPath)"
Targets="Build"
Properties="Configuration=$(Configuration);IsLangPack=%(VsixProjects.IsLangPack);FSharpPackageVersion=$(FSharpPackageVersion);OutputPath=$(VsixBuildLocation);DisableOutputPathCopying=true;$(CustomProps)" />
<MSBuild Projects="%(SwixSetupProjects.ProjectPath)"
Targets="Build"
Properties="LocaleCode=%(SwixSetupProjects.LocaleCode);LocaleId=%(SwixSetupProjects.LocaleId);LocaleParentId=%(SwixSetupProjects.LocaleParentId);LocaleParentCulture=%(SwixSetupProjects.LocaleParentCulture);LocaleSpecificCulture=%(SwixSetupProjects.LocaleSpecificCulture);IsLangPack=%(SwixSetupProjects.IsLangPack);FSharpPackageVersion=$(FSharpPackageVersion);VSGeneralVersion=$(VSGeneralVersion);TargetFramework=$(TargetFramework);$(CustomProps)"/>
Expand Down
2 changes: 1 addition & 1 deletion src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.props
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and

<PropertyGroup>
<DefaultValueTuplePackageVersion>4.4.0</DefaultValueTuplePackageVersion>
<DefaultFSharpCorePackageVersion>4.6.1</DefaultFSharpCorePackageVersion>
<DefaultFSharpCorePackageVersion>4.6.2</DefaultFSharpCorePackageVersion>
<ValueTupleImplicitPackageVersion>$(DefaultValueTuplePackageVersion)</ValueTupleImplicitPackageVersion>
<FSharpCoreImplicitPackageVersion>$(DefaultFSharpCorePackageVersion)</FSharpCoreImplicitPackageVersion>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/fsharp/FSharp.Core/FSharp.Core.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,6 @@

<!-- resources -->
<file src="$artifactsbindir$\FSharp.Core\$configuration$\netstandard1.6\**\FSharp.Core.resources.dll" target="lib\netstandard1.6" />
<file src="$artifactsbindir$\FSharp.Core\$configuration$\**\FSharp.Core.resources.dll" target="lib\net45" />
<file src="$artifactsbindir$\FSharp.Core\$configuration$\net45\**\FSharp.Core.resources.dll" target="lib\net45" />
</files>
</package>
3 changes: 2 additions & 1 deletion src/fsharp/TastOps.fs
Original file line number Diff line number Diff line change
Expand Up @@ -1773,7 +1773,8 @@ let isRefTy g ty =
isFunTy g ty ||
isReprHiddenTy g ty ||
isFSharpObjModelRefTy g ty ||
isUnitTy g ty
isUnitTy g ty ||
(isAnonRecdTy g ty && not (isStructAnonRecdTy g ty))
)

// ECMA C# LANGUAGE SPECIFICATION, 27.2
Expand Down
1 change: 1 addition & 0 deletions src/fsharp/fsi/fsi.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'net472'">
<PlatformTarget>x86</PlatformTarget>
<DefineConstants>$(DefineConstants);FSI_SHADOW_COPY_REFERENCES;FSI_SERVER</DefineConstants>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/fsharp/fsi/xlf/FSIstrings.txt.ru.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@
</trans-unit>
<trans-unit id="fsiInterrupt">
<source>\n- Interrupt\n</source>
<target state="translated">\n- Interrupt\n</target>
<target state="translated">\n- Прерывать\n</target>
<note />
</trans-unit>
<trans-unit id="fsiExit">
Expand Down
2 changes: 1 addition & 1 deletion src/fsharp/pars.fsy
Original file line number Diff line number Diff line change
Expand Up @@ -3834,7 +3834,7 @@ parenExpr:

| LPAREN parenExprBody ends_other_than_rparen_coming_soon_or_recover
{ if not $3 then reportParseErrorAt (rhs parseState 1) (FSComp.SR.parsUnmatchedParen())
let lhsm = unionRangeWithPos (rhs parseState 1) (rhs parseState 3).Start
let lhsm = unionRangeWithPos (rhs parseState 1) (rhs parseState 2).End
SynExpr.Paren(exprFromParseError ($2 lhsm), rhs parseState 1, None, lhsm) }

| LPAREN error rparen
Expand Down
2 changes: 1 addition & 1 deletion src/fsharp/service/ServiceParamInfoLocations.fs
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ module internal NoteworthyParamInfoLocationsImpl =
let inner = traverseSynExpr synExpr
match inner with
| None ->
if AstTraversal.rangeContainsPosEdgesExclusive parenRange pos then
if AstTraversal.rangeContainsPosLeftEdgeExclusiveAndRightEdgeInclusive parenRange pos then
let commasAndCloseParen = ((synExprList, commaRanges@[parenRange]) ||> List.map2 (fun e c -> c.End, getNamedParamName e))
let r = Found (parenRange.Start, commasAndCloseParen, rpRangeOpt.IsSome)
r, None
Expand Down
6 changes: 3 additions & 3 deletions src/fsharp/xlf/FSComp.txt.fr.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -5914,17 +5914,17 @@
</trans-unit>
<trans-unit id="customOperationTextLikeJoin">
<source>{0} var in collection {1} (outerKey = innerKey). Note that parentheses are required after '{2}'</source>
<target state="translated">{0} var in collection {1} (outerKey = innerKey). Notez que les parenthèses sont obligatoires après '{2}'</target>
<target state="translated">var {0} dans la collection {1} (outerKey = innerKey). Notez que les parenthèses sont obligatoires après '{2}'</target>
<note />
</trans-unit>
<trans-unit id="customOperationTextLikeGroupJoin">
<source>{0} var in collection {1} (outerKey = innerKey) into group. Note that parentheses are required after '{2}'</source>
<target state="translated">{0} var in collection {1} (outerKey = innerKey) dans le groupe. Notez que les parenthèses sont obligatoires après '{2}'</target>
<target state="translated">var {0} dans la collection {1} (outerKey = innerKey) au sein du groupe. Notez que les parenthèses sont obligatoires après '{2}'</target>
<note />
</trans-unit>
<trans-unit id="customOperationTextLikeZip">
<source>{0} var in collection</source>
<target state="translated">{0} var in collection</target>
<target state="translated">var {0} dans la collection</target>
<note />
</trans-unit>
<trans-unit id="tcBinaryOperatorRequiresVariable">
Expand Down
4 changes: 2 additions & 2 deletions src/fsharp/xlf/FSComp.txt.ja.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -5916,12 +5916,12 @@
</trans-unit>
<trans-unit id="customOperationTextLikeJoin">
<source>{0} var in collection {1} (outerKey = innerKey). Note that parentheses are required after '{2}'</source>
<target state="translated">{0} var in collection {1} (outerKey = innerKey)。'{2}' の後ろにはかっこが必要です。</target>
<target state="translated">{0} var in collection {1} (outerKey = innerKey)。'{2}' の後にかっこが必要であることに注意してください</target>
<note />
</trans-unit>
<trans-unit id="customOperationTextLikeGroupJoin">
<source>{0} var in collection {1} (outerKey = innerKey) into group. Note that parentheses are required after '{2}'</source>
<target state="translated">{0} var in collection {1} (outerKey = innerKey) into group。'{2}' の後ろにかっこが必要です</target>
<target state="translated">コレクション {1} (outerKey = innerKey) の {0} をグループに var 宣言します。'{2}' の後にかっこが必要であることに注意してください</target>
<note />
</trans-unit>
<trans-unit id="customOperationTextLikeZip">
Expand Down
2 changes: 1 addition & 1 deletion src/fsharp/xlf/FSComp.txt.ko.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -5914,7 +5914,7 @@
</trans-unit>
<trans-unit id="customOperationTextLikeJoin">
<source>{0} var in collection {1} (outerKey = innerKey). Note that parentheses are required after '{2}'</source>
<target state="translated">{0} var in collection {1} (outerKey = innerKey). '{2}' 다음에 괄호가 필요합니다.</target>
<target state="translated">{0} var in collection {1} (outerKey = innerKey). '{2}' 뒤에 괄호가 필요합니다.</target>
<note />
</trans-unit>
<trans-unit id="customOperationTextLikeGroupJoin">
Expand Down
6 changes: 3 additions & 3 deletions src/fsharp/xlf/FSComp.txt.zh-Hans.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -5914,17 +5914,17 @@
</trans-unit>
<trans-unit id="customOperationTextLikeJoin">
<source>{0} var in collection {1} (outerKey = innerKey). Note that parentheses are required after '{2}'</source>
<target state="translated">{0} var in collection {1} (outerKey = innerKey)。请注意,“{2}”后需使用括号</target>
<target state="translated">集合 {1} (outerKey = innerKey)中的 {0} var。请注意,“{2}”后面要使用圆括号</target>
<note />
</trans-unit>
<trans-unit id="customOperationTextLikeGroupJoin">
<source>{0} var in collection {1} (outerKey = innerKey) into group. Note that parentheses are required after '{2}'</source>
<target state="translated">{0} var in collection {1} (outerKey = innerKey) into group。请注意,“{2}”后需使用括号。</target>
<target state="translated">集合 {1} (outerKey = innerKey) 中的 {0} var 到组中。请注意, 在 "{2}" 之后需要圆括号</target>
<note />
</trans-unit>
<trans-unit id="customOperationTextLikeZip">
<source>{0} var in collection</source>
<target state="translated">{0} var in collection</target>
<target state="translated">集合中的 {0} var</target>
<note />
</trans-unit>
<trans-unit id="tcBinaryOperatorRequiresVariable">
Expand Down
6 changes: 3 additions & 3 deletions src/fsharp/xlf/FSComp.txt.zh-Hant.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -5914,17 +5914,17 @@
</trans-unit>
<trans-unit id="customOperationTextLikeJoin">
<source>{0} var in collection {1} (outerKey = innerKey). Note that parentheses are required after '{2}'</source>
<target state="translated">{0} var in collection {1} (outerKey = innerKey)。注意: '{2}' 之後須有括號</target>
<target state="translated">集合 {1} 中的 {0} var (outerKey = innerKey)。請注意,'{2}' 後需要括弧</target>
<note />
</trans-unit>
<trans-unit id="customOperationTextLikeGroupJoin">
<source>{0} var in collection {1} (outerKey = innerKey) into group. Note that parentheses are required after '{2}'</source>
<target state="translated">{0} var in collection {1} (outerKey = innerKey) into group。注意: '{2}' 之後須有括號</target>
<target state="translated">集合 {1} 中的 {0} var (outerKey = innerKey) 進入群組。請注意,'{2}' 後需要括弧。</target>
<note />
</trans-unit>
<trans-unit id="customOperationTextLikeZip">
<source>{0} var in collection</source>
<target state="translated">{0} var in collection</target>
<target state="translated">集合中的 {0} var</target>
<note />
</trans-unit>
<trans-unit id="tcBinaryOperatorRequiresVariable">
Expand Down
2 changes: 1 addition & 1 deletion src/fsharp/xlf/FSStrings.ja.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -1609,7 +1609,7 @@
</trans-unit>
<trans-unit id="MSBuildReferenceResolutionError">
<source>{0} (Code={1})</source>
<target state="translated">{0} (Code={1})</target>
<target state="translated">{0} (コード={1})</target>
<note />
</trans-unit>
<trans-unit id="TargetInvocationExceptionWrapper">
Expand Down
2 changes: 1 addition & 1 deletion src/fsharp/xlf/FSStrings.pt-BR.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -1609,7 +1609,7 @@
</trans-unit>
<trans-unit id="MSBuildReferenceResolutionError">
<source>{0} (Code={1})</source>
<target state="translated">{0} (Code={1})</target>
<target state="translated">{0} (código = {1})</target>
<note />
</trans-unit>
<trans-unit id="TargetInvocationExceptionWrapper">
Expand Down
Loading