From 9db1b37d6cfabfd84caacc2224df0103a9557145 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 20 Sep 2022 14:30:26 -0700 Subject: [PATCH 1/8] Initial change to enable onelocbuild. Add ids to all of the strings in the html files. --- eng/build.yml | 9 +++++++++ .../clisdk/resources/cs.lproj/conclusion.html | 16 ++++++++-------- .../osx/clisdk/resources/cs.lproj/welcome.html | 16 ++++++++-------- .../clisdk/resources/de.lproj/conclusion.html | 16 ++++++++-------- .../osx/clisdk/resources/de.lproj/welcome.html | 16 ++++++++-------- .../clisdk/resources/en.lproj/conclusion.html | 16 ++++++++-------- .../osx/clisdk/resources/en.lproj/welcome.html | 16 ++++++++-------- .../clisdk/resources/es.lproj/conclusion.html | 16 ++++++++-------- .../osx/clisdk/resources/es.lproj/welcome.html | 16 ++++++++-------- .../clisdk/resources/fr.lproj/conclusion.html | 16 ++++++++-------- .../osx/clisdk/resources/fr.lproj/welcome.html | 16 ++++++++-------- .../clisdk/resources/it.lproj/conclusion.html | 16 ++++++++-------- .../osx/clisdk/resources/it.lproj/welcome.html | 16 ++++++++-------- .../clisdk/resources/ja.lproj/conclusion.html | 16 ++++++++-------- .../osx/clisdk/resources/ja.lproj/welcome.html | 16 ++++++++-------- .../clisdk/resources/ko.lproj/conclusion.html | 16 ++++++++-------- .../osx/clisdk/resources/ko.lproj/welcome.html | 16 ++++++++-------- .../clisdk/resources/pl.lproj/conclusion.html | 16 ++++++++-------- .../osx/clisdk/resources/pl.lproj/welcome.html | 16 ++++++++-------- .../clisdk/resources/pt-br.lproj/conclusion.html | 16 ++++++++-------- .../clisdk/resources/pt-br.lproj/welcome.html | 16 ++++++++-------- .../clisdk/resources/ru.lproj/conclusion.html | 16 ++++++++-------- .../osx/clisdk/resources/ru.lproj/welcome.html | 16 ++++++++-------- .../clisdk/resources/tr.lproj/conclusion.html | 16 ++++++++-------- .../osx/clisdk/resources/tr.lproj/welcome.html | 16 ++++++++-------- .../resources/zh-hans.lproj/conclusion.html | 16 ++++++++-------- .../clisdk/resources/zh-hans.lproj/welcome.html | 16 ++++++++-------- .../resources/zh-hant.lproj/conclusion.html | 16 ++++++++-------- .../clisdk/resources/zh-hant.lproj/welcome.html | 16 ++++++++-------- 29 files changed, 233 insertions(+), 224 deletions(-) diff --git a/eng/build.yml b/eng/build.yml index c23bbb11b..59e561632 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -168,3 +168,12 @@ phases: publishLocation: Container continueOnError: true condition: always() + +- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.SourceBranch'], 'refs/heads/release/7.0.1xx'))) }}: + - template: /eng/common/templates/job/onelocbuild.yml + parameters: + CreatePr: true + LclSource: lclFilesfromPackage + LclPackageId: 'LCL-JUNO-PROD-DOTNETINSTALLER' + MirrorBranch: release/7.0.1xx + MirrorRepo: sdk diff --git a/src/redist/targets/packaging/osx/clisdk/resources/cs.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/cs.lproj/conclusion.html index dcfc539c7..b95c78cfb 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/cs.lproj/conclusion.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/cs.lproj/conclusion.html @@ -5,7 +5,7 @@
-

The following was installed +

The following was installed


-

This product collects usage data +

This product collects usage data


-

Resources

+

Resources

diff --git a/src/redist/targets/packaging/osx/clisdk/resources/cs.lproj/welcome.html b/src/redist/targets/packaging/osx/clisdk/resources/cs.lproj/welcome.html index d870f0949..477a68ebe 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/cs.lproj/welcome.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/cs.lproj/welcome.html @@ -7,21 +7,21 @@

.NET SDK

-

.NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

+

.NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

-

Learn more about .NET

+

Learn more about .NET


-

Installation note

-

A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete.

+

Installation note

+

A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete.

diff --git a/src/redist/targets/packaging/osx/clisdk/resources/de.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/de.lproj/conclusion.html index dcfc539c7..b95c78cfb 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/de.lproj/conclusion.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/de.lproj/conclusion.html @@ -5,7 +5,7 @@
-

The following was installed +

The following was installed


-

This product collects usage data +

This product collects usage data


-

Resources

+

Resources

diff --git a/src/redist/targets/packaging/osx/clisdk/resources/de.lproj/welcome.html b/src/redist/targets/packaging/osx/clisdk/resources/de.lproj/welcome.html index d870f0949..477a68ebe 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/de.lproj/welcome.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/de.lproj/welcome.html @@ -7,21 +7,21 @@

.NET SDK

-

.NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

+

.NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

-

Learn more about .NET

+

Learn more about .NET


-

Installation note

-

A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete.

+

Installation note

+

A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete.

diff --git a/src/redist/targets/packaging/osx/clisdk/resources/en.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/en.lproj/conclusion.html index dcfc539c7..b95c78cfb 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/en.lproj/conclusion.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/en.lproj/conclusion.html @@ -5,7 +5,7 @@
-

The following was installed +

The following was installed


-

This product collects usage data +

This product collects usage data


-

Resources

+

Resources

diff --git a/src/redist/targets/packaging/osx/clisdk/resources/en.lproj/welcome.html b/src/redist/targets/packaging/osx/clisdk/resources/en.lproj/welcome.html index d870f0949..477a68ebe 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/en.lproj/welcome.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/en.lproj/welcome.html @@ -7,21 +7,21 @@

.NET SDK

-

.NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

+

.NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

-

Learn more about .NET

+

Learn more about .NET


-

Installation note

-

A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete.

+

Installation note

+

A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete.

diff --git a/src/redist/targets/packaging/osx/clisdk/resources/es.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/es.lproj/conclusion.html index dcfc539c7..b95c78cfb 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/es.lproj/conclusion.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/es.lproj/conclusion.html @@ -5,7 +5,7 @@
-

The following was installed +

The following was installed


-

This product collects usage data +

This product collects usage data


-

Resources

+

Resources

diff --git a/src/redist/targets/packaging/osx/clisdk/resources/es.lproj/welcome.html b/src/redist/targets/packaging/osx/clisdk/resources/es.lproj/welcome.html index d870f0949..477a68ebe 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/es.lproj/welcome.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/es.lproj/welcome.html @@ -7,21 +7,21 @@

.NET SDK

-

.NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

+

.NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

-

Learn more about .NET

+

Learn more about .NET


-

Installation note

-

A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete.

+

Installation note

+

A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete.

diff --git a/src/redist/targets/packaging/osx/clisdk/resources/fr.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/fr.lproj/conclusion.html index dcfc539c7..b95c78cfb 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/fr.lproj/conclusion.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/fr.lproj/conclusion.html @@ -5,7 +5,7 @@
-

The following was installed +

The following was installed


-

This product collects usage data +

This product collects usage data


-

Resources

+

Resources

diff --git a/src/redist/targets/packaging/osx/clisdk/resources/fr.lproj/welcome.html b/src/redist/targets/packaging/osx/clisdk/resources/fr.lproj/welcome.html index d870f0949..477a68ebe 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/fr.lproj/welcome.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/fr.lproj/welcome.html @@ -7,21 +7,21 @@

.NET SDK

-

.NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

+

.NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

-

Learn more about .NET

+

Learn more about .NET


-

Installation note

-

A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete.

+

Installation note

+

A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete.

diff --git a/src/redist/targets/packaging/osx/clisdk/resources/it.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/it.lproj/conclusion.html index dcfc539c7..b95c78cfb 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/it.lproj/conclusion.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/it.lproj/conclusion.html @@ -5,7 +5,7 @@
-

The following was installed +

The following was installed


-

This product collects usage data +

This product collects usage data


-

Resources

+

Resources

diff --git a/src/redist/targets/packaging/osx/clisdk/resources/it.lproj/welcome.html b/src/redist/targets/packaging/osx/clisdk/resources/it.lproj/welcome.html index d870f0949..477a68ebe 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/it.lproj/welcome.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/it.lproj/welcome.html @@ -7,21 +7,21 @@

.NET SDK

-

.NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

+

.NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

-

Learn more about .NET

+

Learn more about .NET


-

Installation note

-

A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete.

+

Installation note

+

A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete.

diff --git a/src/redist/targets/packaging/osx/clisdk/resources/ja.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/ja.lproj/conclusion.html index dcfc539c7..b95c78cfb 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/ja.lproj/conclusion.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/ja.lproj/conclusion.html @@ -5,7 +5,7 @@
-

The following was installed +

The following was installed


-

This product collects usage data +

This product collects usage data


-

Resources

+

Resources

diff --git a/src/redist/targets/packaging/osx/clisdk/resources/ja.lproj/welcome.html b/src/redist/targets/packaging/osx/clisdk/resources/ja.lproj/welcome.html index d870f0949..477a68ebe 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/ja.lproj/welcome.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/ja.lproj/welcome.html @@ -7,21 +7,21 @@

.NET SDK

-

.NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

+

.NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

-

Learn more about .NET

+

Learn more about .NET


-

Installation note

-

A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete.

+

Installation note

+

A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete.

diff --git a/src/redist/targets/packaging/osx/clisdk/resources/ko.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/ko.lproj/conclusion.html index dcfc539c7..b95c78cfb 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/ko.lproj/conclusion.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/ko.lproj/conclusion.html @@ -5,7 +5,7 @@
-

The following was installed +

The following was installed


-

This product collects usage data +

This product collects usage data


-

Resources

+

Resources

diff --git a/src/redist/targets/packaging/osx/clisdk/resources/ko.lproj/welcome.html b/src/redist/targets/packaging/osx/clisdk/resources/ko.lproj/welcome.html index d870f0949..477a68ebe 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/ko.lproj/welcome.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/ko.lproj/welcome.html @@ -7,21 +7,21 @@

.NET SDK

-

.NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

+

.NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

-

Learn more about .NET

+

Learn more about .NET


-

Installation note

-

A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete.

+

Installation note

+

A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete.

diff --git a/src/redist/targets/packaging/osx/clisdk/resources/pl.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/pl.lproj/conclusion.html index dcfc539c7..b95c78cfb 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/pl.lproj/conclusion.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/pl.lproj/conclusion.html @@ -5,7 +5,7 @@
-

The following was installed +

The following was installed


-

This product collects usage data +

This product collects usage data


-

Resources

+

Resources

diff --git a/src/redist/targets/packaging/osx/clisdk/resources/pl.lproj/welcome.html b/src/redist/targets/packaging/osx/clisdk/resources/pl.lproj/welcome.html index d870f0949..477a68ebe 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/pl.lproj/welcome.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/pl.lproj/welcome.html @@ -7,21 +7,21 @@

.NET SDK

-

.NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

+

.NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

-

Learn more about .NET

+

Learn more about .NET


-

Installation note

-

A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete.

+

Installation note

+

A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete.

diff --git a/src/redist/targets/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html index dcfc539c7..b95c78cfb 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html @@ -5,7 +5,7 @@
-

The following was installed +

The following was installed


-

This product collects usage data +

This product collects usage data


-

Resources

+

Resources

diff --git a/src/redist/targets/packaging/osx/clisdk/resources/pt-br.lproj/welcome.html b/src/redist/targets/packaging/osx/clisdk/resources/pt-br.lproj/welcome.html index 3aa06fcd9..ae553da17 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/pt-br.lproj/welcome.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/pt-br.lproj/welcome.html @@ -7,21 +7,21 @@

.NET SDK

-

.NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

+

.NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

-

Learn more about .NET

+

Learn more about .NET


-

Installation note

-

A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete.

+

Installation note

+

A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete.

diff --git a/src/redist/targets/packaging/osx/clisdk/resources/ru.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/ru.lproj/conclusion.html index dcfc539c7..b95c78cfb 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/ru.lproj/conclusion.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/ru.lproj/conclusion.html @@ -5,7 +5,7 @@
-

The following was installed +

The following was installed


-

This product collects usage data +

This product collects usage data


-

Resources

+

Resources

diff --git a/src/redist/targets/packaging/osx/clisdk/resources/ru.lproj/welcome.html b/src/redist/targets/packaging/osx/clisdk/resources/ru.lproj/welcome.html index d870f0949..477a68ebe 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/ru.lproj/welcome.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/ru.lproj/welcome.html @@ -7,21 +7,21 @@

.NET SDK

-

.NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

+

.NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

-

Learn more about .NET

+

Learn more about .NET


-

Installation note

-

A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete.

+

Installation note

+

A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete.

diff --git a/src/redist/targets/packaging/osx/clisdk/resources/tr.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/tr.lproj/conclusion.html index dcfc539c7..b95c78cfb 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/tr.lproj/conclusion.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/tr.lproj/conclusion.html @@ -5,7 +5,7 @@
-

The following was installed +

The following was installed


-

This product collects usage data +

This product collects usage data


-

Resources

+

Resources

diff --git a/src/redist/targets/packaging/osx/clisdk/resources/tr.lproj/welcome.html b/src/redist/targets/packaging/osx/clisdk/resources/tr.lproj/welcome.html index d870f0949..477a68ebe 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/tr.lproj/welcome.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/tr.lproj/welcome.html @@ -7,21 +7,21 @@

.NET SDK

-

.NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

+

.NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

-

Learn more about .NET

+

Learn more about .NET


-

Installation note

-

A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete.

+

Installation note

+

A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete.

diff --git a/src/redist/targets/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html index dcfc539c7..b95c78cfb 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html @@ -5,7 +5,7 @@
-

The following was installed +

The following was installed


-

This product collects usage data +

This product collects usage data


-

Resources

+

Resources

diff --git a/src/redist/targets/packaging/osx/clisdk/resources/zh-hans.lproj/welcome.html b/src/redist/targets/packaging/osx/clisdk/resources/zh-hans.lproj/welcome.html index d870f0949..477a68ebe 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/zh-hans.lproj/welcome.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/zh-hans.lproj/welcome.html @@ -7,21 +7,21 @@

.NET SDK

-

.NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

+

.NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

-

Learn more about .NET

+

Learn more about .NET


-

Installation note

-

A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete.

+

Installation note

+

A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete.

diff --git a/src/redist/targets/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html index dcfc539c7..b95c78cfb 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html @@ -5,7 +5,7 @@
-

The following was installed +

The following was installed


-

This product collects usage data +

This product collects usage data


-

Resources

+

Resources

diff --git a/src/redist/targets/packaging/osx/clisdk/resources/zh-hant.lproj/welcome.html b/src/redist/targets/packaging/osx/clisdk/resources/zh-hant.lproj/welcome.html index d870f0949..477a68ebe 100644 --- a/src/redist/targets/packaging/osx/clisdk/resources/zh-hant.lproj/welcome.html +++ b/src/redist/targets/packaging/osx/clisdk/resources/zh-hant.lproj/welcome.html @@ -7,21 +7,21 @@

.NET SDK

-

.NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

+

.NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

-

Learn more about .NET

+

Learn more about .NET


-

Installation note

-

A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete.

+

Installation note

+

A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete.

From 31b5a5b1d2b34e3cb28a7892771ded043e3fa2e5 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 3 Jan 2023 16:41:27 -0800 Subject: [PATCH 2/8] Fix build.yml errors --- eng/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/build.yml b/eng/build.yml index 59e561632..e51c46da9 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -169,7 +169,8 @@ phases: continueOnError: true condition: always() -- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.SourceBranch'], 'refs/heads/release/7.0.1xx'))) }}: +jobs: +- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.SourceBranch'], 'refs/heads/release/7.0.1xx')))) }}: - template: /eng/common/templates/job/onelocbuild.yml parameters: CreatePr: true From 2dc5249cf9d09790aabcef2c5888f44dacb09cbf Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 3 Jan 2023 16:45:18 -0800 Subject: [PATCH 3/8] Update build.yml --- eng/build.yml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/eng/build.yml b/eng/build.yml index e51c46da9..c0fe3b7c4 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -18,6 +18,15 @@ parameters: enablePublishUsingPipelines: true phases: +- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.SourceBranch'], 'refs/heads/release/7.0.1xx')))) }}: + - template: /eng/common/templates/job/onelocbuild.yml + parameters: + CreatePr: true + LclSource: lclFilesfromPackage + LclPackageId: 'LCL-JUNO-PROD-DOTNETINSTALLER' + MirrorBranch: release/7.0.1xx + MirrorRepo: sdk + - template: /eng/common/templates/job/job.yml parameters: ${{ if parameters.pgoInstrument }}: @@ -168,13 +177,3 @@ phases: publishLocation: Container continueOnError: true condition: always() - -jobs: -- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.SourceBranch'], 'refs/heads/release/7.0.1xx')))) }}: - - template: /eng/common/templates/job/onelocbuild.yml - parameters: - CreatePr: true - LclSource: lclFilesfromPackage - LclPackageId: 'LCL-JUNO-PROD-DOTNETINSTALLER' - MirrorBranch: release/7.0.1xx - MirrorRepo: sdk From d17b9bf56277ea285c3dc12b43c0fada44418a52 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 3 Jan 2023 16:50:20 -0800 Subject: [PATCH 4/8] Update build.yml --- eng/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/build.yml b/eng/build.yml index c0fe3b7c4..c63188cd2 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -17,8 +17,8 @@ parameters: # Publish using pipelines enablePublishUsingPipelines: true -phases: -- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.SourceBranch'], 'refs/heads/release/7.0.1xx')))) }}: +jobs: +- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.SourceBranch'], 'refs/heads/main')) }}: - template: /eng/common/templates/job/onelocbuild.yml parameters: CreatePr: true From 02669ffb12c9ef9f343716b68234ed4d9ec39031 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 3 Jan 2023 17:08:53 -0800 Subject: [PATCH 5/8] enable for testing in CI --- eng/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/build.yml b/eng/build.yml index c63188cd2..2944d5f36 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -18,13 +18,13 @@ parameters: enablePublishUsingPipelines: true jobs: -- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.SourceBranch'], 'refs/heads/main')) }}: +- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(variables['Build.SourceBranch'], 'refs/heads/main')) }}: - template: /eng/common/templates/job/onelocbuild.yml parameters: CreatePr: true LclSource: lclFilesfromPackage LclPackageId: 'LCL-JUNO-PROD-DOTNETINSTALLER' - MirrorBranch: release/7.0.1xx + MirrorBranch: main MirrorRepo: sdk - template: /eng/common/templates/job/job.yml From 3dc28600f75dbf0b1e2d7cf3064003cd17e3973f Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 3 Jan 2023 17:15:14 -0800 Subject: [PATCH 6/8] Update yml --- eng/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/build.yml b/eng/build.yml index 2944d5f36..0b97aa678 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -18,7 +18,7 @@ parameters: enablePublishUsingPipelines: true jobs: -- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(variables['Build.SourceBranch'], 'refs/heads/main')) }}: +- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.SourceBranch'], 'refs/heads/marcpopMSFT-enablelocbuild')) }}: - template: /eng/common/templates/job/onelocbuild.yml parameters: CreatePr: true From 1614a274346ce350f853c45582277af8ca5250f5 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 3 Jan 2023 17:22:36 -0800 Subject: [PATCH 7/8] Move onelocbuild out of the build.yml file --- .vsts-ci.yml | 9 +++++++++ eng/build.yml | 11 +---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index ff04a8a6f..244511913 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -387,3 +387,12 @@ stages: -TsaRepositoryName "dotnet-installer" -TsaCodebaseName "dotnet-installer" -TsaPublish $True' + +- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.SourceBranch'], 'refs/heads/marcpopMSFT-enablelocbuild')) }}: + - template: /eng/common/templates/job/onelocbuild.yml + parameters: + CreatePr: true + LclSource: lclFilesfromPackage + LclPackageId: 'LCL-JUNO-PROD-DOTNETINSTALLER' + MirrorBranch: main + MirrorRepo: sdk \ No newline at end of file diff --git a/eng/build.yml b/eng/build.yml index 0b97aa678..c23bbb11b 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -17,16 +17,7 @@ parameters: # Publish using pipelines enablePublishUsingPipelines: true -jobs: -- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.SourceBranch'], 'refs/heads/marcpopMSFT-enablelocbuild')) }}: - - template: /eng/common/templates/job/onelocbuild.yml - parameters: - CreatePr: true - LclSource: lclFilesfromPackage - LclPackageId: 'LCL-JUNO-PROD-DOTNETINSTALLER' - MirrorBranch: main - MirrorRepo: sdk - +phases: - template: /eng/common/templates/job/job.yml parameters: ${{ if parameters.pgoInstrument }}: From 9d18b7120f89709ce3d61ab221596c5a9ac32082 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 3 Jan 2023 17:24:16 -0800 Subject: [PATCH 8/8] Move it up the yml --- .vsts-ci.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 244511913..5f981d8e1 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -49,6 +49,14 @@ variables: stages: - stage: build jobs: + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.SourceBranch'], 'refs/heads/marcpopMSFT-enablelocbuild')) }}: + - template: /eng/common/templates/job/onelocbuild.yml + parameters: + CreatePr: true + LclSource: lclFilesfromPackage + LclPackageId: 'LCL-JUNO-PROD-DOTNETINSTALLER' + MirrorBranch: main + MirrorRepo: sdk - job: Publish_Build_Configuration pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: @@ -387,12 +395,3 @@ stages: -TsaRepositoryName "dotnet-installer" -TsaCodebaseName "dotnet-installer" -TsaPublish $True' - -- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.SourceBranch'], 'refs/heads/marcpopMSFT-enablelocbuild')) }}: - - template: /eng/common/templates/job/onelocbuild.yml - parameters: - CreatePr: true - LclSource: lclFilesfromPackage - LclPackageId: 'LCL-JUNO-PROD-DOTNETINSTALLER' - MirrorBranch: main - MirrorRepo: sdk \ No newline at end of file