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.

Sign up for GitHub

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

Jump to bottom

Merge release/6.0.1xx-preview2 to release/6.0.1xx-preview3 #4951

Merged
merged 14 commits into from
Mar 30, 2021
Merged

Merge release/6.0.1xx-preview2 to release/6.0.1xx-preview3 #4951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
68cc23d
Fixup feeds
mmitche Jan 28, 2021
029d4a6
Merge pull request #4813 from dotnet/feed-update-release/5.0.1xx
genlu Feb 9, 2021
123e99e
Fix localization failure (#4583)
buyaa-n Dec 16, 2020
97205a2
Merge pull request #4821 from buyaa-n/release/5.0.2xx
genlu Feb 9, 2021
ed46154
Update dependencies from https://github.com/dotnet/arcade build 20210…
dotnet-maestro[bot] Feb 12, 2021
667c887
Merge pull request #4817 from dotnet/merges/release/5.0.1xx-to-releas…
mavasani Feb 16, 2021
31d239c
Loc update (#4805)
cristianosuzuki77 Feb 16, 2021
e34d805
Merge conflicts
buyaa-n Feb 17, 2021
0875a4a
One file left out from merge
buyaa-n Feb 17, 2021
29e9d9a
Merge pull request #4855 from dotnet/merges/release/5.0.2xx-to-releas…
jmarolf Feb 17, 2021
6b1d2cf
CA-1418 Validate platform string (#4838)
buyaa-n Feb 26, 2021
e6a7324
Merge branch 'release/6.0.1xx-preview2' into merges/release/6.0.1xx-p…
jmarolf Mar 3, 2021
eefe897
Merge pull request #4867 from dotnet/merges/release/6.0.1xx-preview1-…
jmarolf Mar 15, 2021
df5ddc4
Merge remote-tracking branch 'dotnet/release/6.0.1xx-preview2' into m…
buyaa-n Mar 18, 2021
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
15 changes: 0 additions & 15 deletions eng/common/templates/post-build/post-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,18 +569,3 @@ stages:
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json'
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'

- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
parameters:
BARBuildId: ${{ parameters.BARBuildId }}
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
dependsOn: ${{ parameters.publishDependsOn }}
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
stageName: 'VS_16_10_Publishing'
channelName: 'VS 16.10'
channelId: ${{ parameters.VS1610ChannelId }}
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json'
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
2 changes: 1 addition & 1 deletion src/Microsoft.CodeAnalysis.Analyzers/Core/xlf/CodeAnalysisDiagnosticsResources.ja.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@
</trans-unit>
<trans-unit id="RemoveDuplicateEntriesBetweenAnalyzerReleasesRuleTitle">
<source>Remove duplicate entries for diagnostic ID between analyzer releases</source>
<target state="translated">アナライザー リリース間で診断 ID の重複しているエントリを削除する</target>
<target state="translated">アナライザー リリース間で診断 ID の重複しているエントリを削除してください</target>
<note />
</trans-unit>
<trans-unit id="RemoveDuplicateEntriesForAnalyzerReleaseRuleDescription">
Expand Down
2 changes: 1 addition & 1 deletion ...rs/Core/Microsoft.CodeQuality.Analyzers/xlf/MicrosoftCodeQualityAnalyzersResources.ja.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
</trans-unit>
<trans-unit id="DoNotCatchGeneralExceptionTypesMessage">
<source>Modify '{0}' to catch a more specific allowed exception type, or rethrow the exception</source>
<target state="translated">{0}' を変更してより具体的な許可された例外の種類をキャッチするか、例外を再スローしてください</target>
<target state="translated">'{0}' を変更してより具体的な許可された例外の種類をキャッチするか、例外を再スローしてください</target>
<note />
</trans-unit>
<trans-unit id="DoNotCatchGeneralExceptionTypesTitle">
Expand Down
2 changes: 1 addition & 1 deletion ...re/Microsoft.CodeQuality.Analyzers/xlf/MicrosoftCodeQualityAnalyzersResources.zh-Hans.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
</trans-unit>
<trans-unit id="DoNotDeclareProtectedMembersInSealedTypesMessage">
<source>'{0}' is a new protected member in the 'NonInheritable' class '{1}'</source>
<target state="translated">“{0}” 是 NonInheritable 类 "{1}” 中新的受保护成员</target>
<target state="translated">“{0}”是 NonInheritable 类“{1}”中新的受保护成员</target>
<note />
</trans-unit>
<trans-unit id="DoNotDeclareProtectedMembersInSealedTypesTitle">
Expand Down
4 changes: 2 additions & 2 deletions ...re/Microsoft.CodeQuality.Analyzers/xlf/MicrosoftCodeQualityAnalyzersResources.zh-Hant.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1514,7 +1514,7 @@
</trans-unit>
<trans-unit id="AvoidExcessiveClassCouplingMessage">
<source>'{0}' is coupled with '{1}' different types from '{2}' different namespaces. Rewrite or refactor the code to decrease its class coupling below '{3}'.</source>
<target state="translated">‘{0}’ 與 ‘{2}’ 個不同命名空間中 '{1}’ 個不同的類型結合。請重寫或重構程式碼，以將其類別結合程度降低至 ‘{3}’ 以下。</target>
<target state="translated">'{0}' 已與來自 '{2}' 個不同命名空間中的 '{1}' 個不同類型結合。請重寫或重構程式碼，以將其類別結合程度降低至 '{3}' 以下。</target>
<note />
</trans-unit>
<trans-unit id="AvoidExcessiveClassCouplingTitle">
Expand Down Expand Up @@ -1559,7 +1559,7 @@
</trans-unit>
<trans-unit id="AvoidUnmantainableCodeMessage">
<source>'{0}' has a maintainability index of '{1}'. Rewrite or refactor the code to increase its maintainability index (MI) above '{2}'.</source>
<target state="translated">‘{0}’ 的可維護性指數為 '{1}’。請重寫或重構程式碼，以將其可維護性指數 (MI) 提高到 ‘{2}’ 以上。</target>
<target state="translated">'{0}' 的可維護性指數為 '{1}'。請重寫或重構程式碼，以將其可維護性指數 (MI) 提高到 '{2}' 以上。</target>
<note />
</trans-unit>
<trans-unit id="AvoidUnmantainableCodeTitle">
Expand Down
2 changes: 1 addition & 1 deletion ...tAnalyzers/Core/Microsoft.NetCore.Analyzers/xlf/MicrosoftNetCoreAnalyzersResources.de.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@
</trans-unit>
<trans-unit id="DoNotAddArchiveItemPathToTheTargetFileSystemPathMessage">
<source>When creating path for '{0} in method {1}' from relative archive item path to extract file and the source is an untrusted zip archive, make sure to sanitize relative archive item path '{2} in method {3}'</source>
<target state="translated">Wenn Sie einen Pfad für "{0} in der Methode "{1}" vom relativen Archivelementpfad zur Extraktionsdatei erstellen und die Quelle ein nicht vertrauenswürdiges ZIP-Archiv ist, stellen Sie sicher, dass der relative Archivelementpfad "{2}" in der Methode "{3}" bereinigt wird.</target>
<target state="translated">Wenn Sie einen Pfad für "{0} in Methode {1}" aus dem relativen Archivelementpfad zur Extraktionsdatei erstellen und die Quelle ein nicht vertrauenswürdiges ZIP-Archiv ist, stellen Sie sicher, dass der relative Archivelementpfad "{2} in Methode {3}" bereinigt wird.</target>
<note />
</trans-unit>
<trans-unit id="DoNotAddSchemaByURL">
Expand Down