Skip to content

Commit dbc260c

Browse files
author
dotnet-automerge-bot
authored
Merge pull request #7469 from dotnet/merges/release/dev16.3-to-release/dev16.4
Merge release/dev16.3 to release/dev16.4
2 parents 27be414 + 256341a commit dbc260c

File tree

104 files changed

+320
-331
lines changed

Some content is hidden

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

104 files changed

+320
-331
lines changed

‎NuGet.config‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,15 @@
1818
<add key="interactive-window" value="https://dotnet.myget.org/F/interactive-window/api/v3/index.json" />
1919
<add key="vs-devcore" value="https://myget.org/F/vs-devcore/api/v3/index.json" />
2020
<add key="vs-editor" value="https://myget.org/F/vs-editor/api/v3/index.json" />
21-
<add key="vssdk" value="https://vside.myget.org/F/vssdk/api/v3/index.json" />
22-
<add key="vs-impl" value="https://vside.myget.org/F/vs-impl/api/v3/index.json" />
21+
<add key="vssdk" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk/nuget/v3/index.json" />
22+
<add key="vs-impl" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json" />
2323
<add key="roslyn_concord" value="https://myget.org/F/roslyn_concord/api/v3/index.json" />
24-
<add key="devcore" value="https://vside.myget.org/F/devcore/api/v3/index.json" />
24+
<add key="dotnet-windowsdesktop" value="https://dotnetfeed.blob.core.windows.net/dotnet-windowsdesktop/index.json" />
25+
<add key="aspnet-aspnetcore" value="https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore/index.json" />
26+
<add key="aspnet-aspnetcore-tooling" value="https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore-tooling/index.json" />
27+
<add key="aspnet-entityframeworkcore" value="https://dotnetfeed.blob.core.windows.net/aspnet-entityframeworkcore/index.json" />
28+
<add key="aspnet-extensions" value="https://dotnetfeed.blob.core.windows.net/aspnet-extensions/index.json" />
29+
<add key="gRPC repository" value="https://grpc.jfrog.io/grpc/api/nuget/v3/grpc-nuget-dev" />
2530
</packageSources>
2631
<disabledPackageSources>
2732
<clear />

‎eng/Versions.props‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,9 @@
5959
https://dotnet.myget.org/F/interactive-window/api/v3/index.json;
6060
https://myget.org/F/vs-devcore/api/v3/index.json;
6161
https://myget.org/F/vs-editor/api/v3/index.json;
62-
https://vside.myget.org/F/vssdk/api/v3/index.json;
63-
https://vside.myget.org/F/vs-impl/api/v3/index.json;
62+
https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk/nuget/v3/index.json;
63+
https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json;
6464
https://myget.org/F/roslyn_concord/api/v3/index.json;
65-
https://vside.myget.org/F/devcore/api/v3/index.json;
6665
</RestoreSources>
6766
<!-- version numbers from files -->
6867
<RoslynVersion>$([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)..\RoslynPackageVersion.txt').Trim())</RoslynVersion>

‎src/fsharp/FSharp.Build/xlf/FSBuild.txt.ja.xlf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<body>
55
<trans-unit id="fSharpBannerVersion">
66
<source>{0} for F# {1}</source>
7-
<target state="translated">F# {1} の {0}</target>
7+
<target state="translated">F# {1} のための {0}</target>
88
<note />
99
</trans-unit>
1010
<trans-unit id="toolpathUnknown">

‎src/fsharp/FSharp.Core/xlf/FSCore.cs.xlf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -709,7 +709,7 @@
709709
</trans-unit>
710710
<trans-unit id="maxDegreeOfParallelismNotPositive">
711711
<source>maxDegreeOfParallelism must be positive, was {0}</source>
712-
<target state="new">maxDegreeOfParallelism must be positive, was {0}</target>
712+
<target state="translated">Hodnota maxDegreeOfParallelism musí být kladná, ale vyskytla se hodnota {0}.</target>
713713
<note />
714714
</trans-unit>
715715
</body>

‎src/fsharp/FSharp.Core/xlf/FSCore.de.xlf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -709,7 +709,7 @@
709709
</trans-unit>
710710
<trans-unit id="maxDegreeOfParallelismNotPositive">
711711
<source>maxDegreeOfParallelism must be positive, was {0}</source>
712-
<target state="new">maxDegreeOfParallelism must be positive, was {0}</target>
712+
<target state="translated">maxDegreeOfParallelism muss positiv sein, lautete jedoch "{0}".</target>
713713
<note />
714714
</trans-unit>
715715
</body>

‎src/fsharp/FSharp.Core/xlf/FSCore.es.xlf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -709,7 +709,7 @@
709709
</trans-unit>
710710
<trans-unit id="maxDegreeOfParallelismNotPositive">
711711
<source>maxDegreeOfParallelism must be positive, was {0}</source>
712-
<target state="new">maxDegreeOfParallelism must be positive, was {0}</target>
712+
<target state="translated">maxDegreeOfParallelism debe ser positivo, era {0}</target>
713713
<note />
714714
</trans-unit>
715715
</body>

‎src/fsharp/FSharp.Core/xlf/FSCore.fr.xlf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -709,7 +709,7 @@
709709
</trans-unit>
710710
<trans-unit id="maxDegreeOfParallelismNotPositive">
711711
<source>maxDegreeOfParallelism must be positive, was {0}</source>
712-
<target state="new">maxDegreeOfParallelism must be positive, was {0}</target>
712+
<target state="translated">maxDegreeOfParallelism doit être positif, était {0}</target>
713713
<note />
714714
</trans-unit>
715715
</body>

‎src/fsharp/FSharp.Core/xlf/FSCore.it.xlf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -709,7 +709,7 @@
709709
</trans-unit>
710710
<trans-unit id="maxDegreeOfParallelismNotPositive">
711711
<source>maxDegreeOfParallelism must be positive, was {0}</source>
712-
<target state="new">maxDegreeOfParallelism must be positive, was {0}</target>
712+
<target state="translated">Il valore di maxDegreeOfParallelism deve essere positivo. È {0}</target>
713713
<note />
714714
</trans-unit>
715715
</body>

‎src/fsharp/FSharp.Core/xlf/FSCore.ja.xlf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -709,7 +709,7 @@
709709
</trans-unit>
710710
<trans-unit id="maxDegreeOfParallelismNotPositive">
711711
<source>maxDegreeOfParallelism must be positive, was {0}</source>
712-
<target state="new">maxDegreeOfParallelism must be positive, was {0}</target>
712+
<target state="translated">maxDegreeOfParallelism には正の値を指定する必要がありますが、{0} が指定されました</target>
713713
<note />
714714
</trans-unit>
715715
</body>

‎src/fsharp/FSharp.Core/xlf/FSCore.ko.xlf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -709,7 +709,7 @@
709709
</trans-unit>
710710
<trans-unit id="maxDegreeOfParallelismNotPositive">
711711
<source>maxDegreeOfParallelism must be positive, was {0}</source>
712-
<target state="new">maxDegreeOfParallelism must be positive, was {0}</target>
712+
<target state="translated">maxDegreeOfParallelism은 양수여야 하는데 {0}였습니다.</target>
713713
<note />
714714
</trans-unit>
715715
</body>

0 commit comments

Comments
 (0)