From a97614f7e66fb788b587f76e0b19f8f887deda22 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 26 May 2021 05:01:11 -0400 Subject: [PATCH 01/18] spelling: configuration Signed-off-by: Josh Soref --- src/SdkResolver/SdkResolver.csproj | 2 +- src/VSTemplateLocator/VSTemplateLocator.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SdkResolver/SdkResolver.csproj b/src/SdkResolver/SdkResolver.csproj index 70089c1f1..e923b917e 100644 --- a/src/SdkResolver/SdkResolver.csproj +++ b/src/SdkResolver/SdkResolver.csproj @@ -5,7 +5,7 @@ false false false - false + false UNUSED true diff --git a/src/VSTemplateLocator/VSTemplateLocator.csproj b/src/VSTemplateLocator/VSTemplateLocator.csproj index 348b13fb5..5f5b60dff 100644 --- a/src/VSTemplateLocator/VSTemplateLocator.csproj +++ b/src/VSTemplateLocator/VSTemplateLocator.csproj @@ -5,7 +5,7 @@ false false false - false + false UNUSED true From 754334ccac11a26b43b58dba98a3d2ee3637387c Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 26 May 2021 05:11:10 -0400 Subject: [PATCH 02/18] spelling: crossgen Signed-off-by: Josh Soref --- src/core-sdk-tasks/Crossgen.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core-sdk-tasks/Crossgen.cs b/src/core-sdk-tasks/Crossgen.cs index 99e99d707..eb173d3c6 100644 --- a/src/core-sdk-tasks/Crossgen.cs +++ b/src/core-sdk-tasks/Crossgen.cs @@ -112,7 +112,7 @@ namespace Microsoft.DotNet.Build.Tasks // occasionally formatted as something that base would recognize as // a canonically formatted warning anyway. // - // One thing that is consistent is that crossgne errors go to stderr + // One thing that is consistent is that crossgen errors go to stderr // and everything else goes to stdout. Above, we set stderr to high // importance above, and stdout to normal. So we can use that here // to distinguish between errors and messages. From 544efe1f73a0c893166fab8588432221a9dbb21b Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 26 May 2021 05:01:13 -0400 Subject: [PATCH 03/18] spelling: dependents Signed-off-by: Josh Soref --- src/finalizer/finalizer.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/finalizer/finalizer.cpp b/src/finalizer/finalizer.cpp index 5860d3df0..170900016 100644 --- a/src/finalizer/finalizer.cpp +++ b/src/finalizer/finalizer.cpp @@ -90,9 +90,9 @@ extern "C" HRESULT RemoveDependent(LPWSTR sczDependent, BOOL* pbRestartRequired) ExitOnFailure(hr, "Unable to open dependents key."); // Enumerate over all the dependent keys - for (DWORD dwDepdentsKeyIndex = 0;; ++dwDepdentsKeyIndex) + for (DWORD dwDependentsKeyIndex = 0;; ++dwDependentsKeyIndex) { - hr = RegKeyEnum(hkDependentsKey, dwDepdentsKeyIndex, &sczDependentsKey); + hr = RegKeyEnum(hkDependentsKey, dwDependentsKeyIndex, &sczDependentsKey); if (E_NOMOREITEMS == hr) { @@ -110,7 +110,7 @@ extern "C" HRESULT RemoveDependent(LPWSTR sczDependent, BOOL* pbRestartRequired) ExitOnFailure(hr, "Failed to delete dependent \"%ls\"", sczDependent); LogStringLine(REPORT_STANDARD, " Dependent deleted"); // Reset the index since we're deleting keys while enumerating - dwDepdentsKeyIndex = dwDepdentsKeyIndex > 1 ? dwDepdentsKeyIndex-- : 0; + dwDependentsKeyIndex = dwDependentsKeyIndex > 1 ? dwDependentsKeyIndex-- : 0; // Check if there are any subkeys remaining under the dependents key. If not, we // can uninstall the MSI. We'll recheck the key again in case the MSI fails to clean up the From ae95bb2b31171203d3e50f75706de8a4f9bc969b Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 26 May 2021 05:01:14 -0400 Subject: [PATCH 04/18] spelling: downloaded Signed-off-by: Josh Soref --- eng/common/templates/job/execute-sdl.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index 4a32181fd..50fb29e6d 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -6,7 +6,7 @@ parameters: # 'continueOnError', the parameter value is not correctly picked up. # This can also be remedied by the caller (post-build.yml) if it does not use a nested parameter sdlContinueOnError: false # optional: determines whether to continue the build if the step errors; - downloadArtifacts: true # optional: determines if the artifacts should be dowloaded + downloadArtifacts: true # optional: determines if the artifacts should be downloaded dependsOn: '' # Optional: dependencies of the job artifactNames: '' # Optional: patterns supplied to DownloadBuildArtifacts # Usage: From 0e2bf5edbb202716cb62c208fa41a5fe9ecc1e9b Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 26 May 2021 05:01:15 -0400 Subject: [PATCH 05/18] spelling: during Signed-off-by: Josh Soref --- src/finalizer/finalizer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/finalizer/finalizer.cpp b/src/finalizer/finalizer.cpp index 170900016..3d3765b82 100644 --- a/src/finalizer/finalizer.cpp +++ b/src/finalizer/finalizer.cpp @@ -79,7 +79,7 @@ extern "C" HRESULT RemoveDependent(LPWSTR sczDependent, BOOL* pbRestartRequired) hr = RegOpen(hkProviderKey, L"Dependents", KEY_READ | KEY_WRITE, &hkDependentsKey); if (E_FILENOTFOUND == hr) { - // Providers can sometimes become orphaned duirng uninstalls. If there's no Dependents subkey, we just + // Providers can sometimes become orphaned during uninstalls. If there's no Dependents subkey, we just // release the handle and continue to the next provider key. hr = S_OK; ReleaseRegKey(hkProviderKey); From 049a0dcccfa3c327d881766e594ac8b171fb9e30 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 26 May 2021 05:01:16 -0400 Subject: [PATCH 06/18] spelling: enabled Signed-off-by: Josh Soref --- test/SdkTests/SdkTests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj index 2151e3093..50169f6c6 100644 --- a/test/SdkTests/SdkTests.csproj +++ b/test/SdkTests/SdkTests.csproj @@ -121,7 +121,7 @@ $(DotnetToTestPath)shared\Microsoft.NETCore.App\$(RuntimeVersionToInstall) - powershell -NoLogo -NoProfile -ExecutionPolicy ByPass -Command "& { $(InstallRuntimeCommand) [Net.ServicePointManager]::SecurityProtocol = 'Tls12, Tls13'; From 402c6e5ee94a9d391506970a23942a231770d4d3 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 26 May 2021 05:01:17 -0400 Subject: [PATCH 07/18] spelling: framework Signed-off-by: Josh Soref --- test/SdkTests/SdkTests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj index 50169f6c6..d29c94b0e 100644 --- a/test/SdkTests/SdkTests.csproj +++ b/test/SdkTests/SdkTests.csproj @@ -292,7 +292,7 @@ - + From 0996744cc057ca0cfc7871935862d4d6c0548a8d Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 26 May 2021 05:01:19 -0400 Subject: [PATCH 08/18] spelling: implicit Signed-off-by: Josh Soref --- src/redist/targets/SetBuildDefaults.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/SetBuildDefaults.targets b/src/redist/targets/SetBuildDefaults.targets index 4f37eaa0a..eac457403 100644 --- a/src/redist/targets/SetBuildDefaults.targets +++ b/src/redist/targets/SetBuildDefaults.targets @@ -27,7 +27,7 @@ - + From 4a643533f3d5598012b9773b335149c0687020b8 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 26 May 2021 05:01:21 -0400 Subject: [PATCH 09/18] spelling: occurred Signed-off-by: Josh Soref --- src/core-sdk-tasks/ZipFileCreateFromDirectory.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core-sdk-tasks/ZipFileCreateFromDirectory.cs b/src/core-sdk-tasks/ZipFileCreateFromDirectory.cs index 86c33611c..cb062e529 100644 --- a/src/core-sdk-tasks/ZipFileCreateFromDirectory.cs +++ b/src/core-sdk-tasks/ZipFileCreateFromDirectory.cs @@ -107,7 +107,7 @@ namespace Microsoft.DotNet.Build.Tasks catch (Exception e) { // We have 2 log calls because we want a nice error message but we also want to capture the callstack in the log. - Log.LogError("An exception has occured while trying to compress '{0}' into '{1}'.", SourceDirectory, DestinationArchive); + Log.LogError("An exception has occurred while trying to compress '{0}' into '{1}'.", SourceDirectory, DestinationArchive); Log.LogMessage(MessageImportance.Low, e.ToString()); return false; } From 16efdaacbba520e76c5f8fcef28f693d29be5f74 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 26 May 2021 05:01:22 -0400 Subject: [PATCH 10/18] spelling: package Signed-off-by: Josh Soref --- src/core-sdk-tasks/BuildFPMToolPreReqs.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core-sdk-tasks/BuildFPMToolPreReqs.cs b/src/core-sdk-tasks/BuildFPMToolPreReqs.cs index 8aaf19dfa..2ddeb2eeb 100644 --- a/src/core-sdk-tasks/BuildFPMToolPreReqs.cs +++ b/src/core-sdk-tasks/BuildFPMToolPreReqs.cs @@ -113,7 +113,7 @@ namespace Microsoft.DotNet.Build.Tasks // --iteration : the iteration to give to the package. This comes from the package_revision --JSON // --url : url for this package. --JSON // --verbose : Set verbose output for FPM tool --Static - // : Add all the folder mappings for packge_root, docs, man pages --Static + // : Add all the folder mappings for package_root, docs, man pages --Static var parameters = new List(); parameters.Add("-s dir"); From 3676a7454807c8dd5275bda4f80d5bc80856c11b Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 26 May 2021 05:01:23 -0400 Subject: [PATCH 11/18] spelling: parameters Signed-off-by: Josh Soref --- src/core-sdk-tasks/BuildFPMToolPreReqs.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core-sdk-tasks/BuildFPMToolPreReqs.cs b/src/core-sdk-tasks/BuildFPMToolPreReqs.cs index 2ddeb2eeb..ec43d0ae3 100644 --- a/src/core-sdk-tasks/BuildFPMToolPreReqs.cs +++ b/src/core-sdk-tasks/BuildFPMToolPreReqs.cs @@ -52,7 +52,7 @@ namespace Microsoft.DotNet.Build.Tasks // Build the full list of parameters FPMParameters = BuildCmdParameters(configJson, PackageVersion); - Log.LogMessage(MessageImportance.Normal, "Generated RPM paramters: " + FPMParameters); + Log.LogMessage(MessageImportance.Normal, "Generated RPM parameters: " + FPMParameters); return !Log.HasLoggedErrors; } From deb32b15fde7959526457d8372a0701bb0ae845f Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 26 May 2021 05:01:25 -0400 Subject: [PATCH 12/18] spelling: permissions Signed-off-by: Josh Soref --- eng/docker/alpine.3.6/Dockerfile | 2 +- eng/docker/centos/Dockerfile | 2 +- eng/docker/rhel/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/docker/alpine.3.6/Dockerfile b/eng/docker/alpine.3.6/Dockerfile index 9f9461690..15bf10c69 100644 --- a/eng/docker/alpine.3.6/Dockerfile +++ b/eng/docker/alpine.3.6/Dockerfile @@ -14,7 +14,7 @@ ARG USER_ID=0 RUN adduser code_executor -u ${USER_ID} -G root -D RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers -# With the User Change, we need to change permssions on these directories +# With the User Change, we need to change permissions on these directories RUN chmod -R a+rwx /usr/local RUN chmod -R a+rwx /home diff --git a/eng/docker/centos/Dockerfile b/eng/docker/centos/Dockerfile index eec66c48c..8f2dbefae 100644 --- a/eng/docker/centos/Dockerfile +++ b/eng/docker/centos/Dockerfile @@ -13,7 +13,7 @@ ARG USER_ID=0 RUN useradd -m code_executor -u ${USER_ID} -g root RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers -# With the User Change, we need to change permssions on these directories +# With the User Change, we need to change permissions on these directories RUN chmod -R a+rwx /usr/local RUN chmod -R a+rwx /home RUN chmod -R 755 /usr/bin/sudo diff --git a/eng/docker/rhel/Dockerfile b/eng/docker/rhel/Dockerfile index cd5ec2d15..b4f65be91 100644 --- a/eng/docker/rhel/Dockerfile +++ b/eng/docker/rhel/Dockerfile @@ -11,7 +11,7 @@ ARG USER_ID=0 RUN useradd -m code_executor -u ${USER_ID} -g root RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers -# With the User Change, we need to change permssions on these directories +# With the User Change, we need to change permissions on these directories RUN chmod -R a+rwx /usr/local RUN chmod -R a+rwx /home RUN chown root:root /usr/bin/sudo && chmod 4755 /usr/bin/sudo From ca747758d723206b25233bc2e1f4f31141abc817 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 26 May 2021 05:01:26 -0400 Subject: [PATCH 13/18] spelling: release Signed-off-by: Josh Soref --- .../TableGenerator.Tests/DomainTests.fs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/sdk-readme-table-generator/TableGenerator.Tests/DomainTests.fs b/tools/sdk-readme-table-generator/TableGenerator.Tests/DomainTests.fs index edd2aa433..06f6574fa 100644 --- a/tools/sdk-readme-table-generator/TableGenerator.Tests/DomainTests.fs +++ b/tools/sdk-readme-table-generator/TableGenerator.Tests/DomainTests.fs @@ -18,7 +18,7 @@ let ``it can Shorten main branch Name``() = branchNameShorten branch |> should equal "main" [] -let ``it can Shorten releae branch Name``() = +let ``it can Shorten release branch Name``() = let branch = { GitBranchName = "release/3.1.1xx" DisplayName = "Release/3.1.1XX
(3.1.x Runtime)" From b13cac9c486e5bbde26e3c60b208fbf0445ed42a Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 26 May 2021 05:01:27 -0400 Subject: [PATCH 14/18] spelling: specifying Signed-off-by: Josh Soref --- eng/common/init-tools-native.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/common/init-tools-native.sh b/eng/common/init-tools-native.sh index 5bd205b5d..5ab53e602 100755 --- a/eng/common/init-tools-native.sh +++ b/eng/common/init-tools-native.sh @@ -60,8 +60,8 @@ while (($# > 0)); do echo " - (default) %USERPROFILE%/.netcoreeng/native" echo "" echo " --clean Switch specifying not to install anything, but cleanup native asset folders" - echo " --donotabortonfailure Switch specifiying whether to abort native tools installation on failure" - echo " --donotdisplaywarnings Switch specifiying whether to display warnings during native tools installation on failure" + echo " --donotabortonfailure Switch specifying whether to abort native tools installation on failure" + echo " --donotdisplaywarnings Switch specifying whether to display warnings during native tools installation on failure" echo " --force Clean and then install tools" echo " --help Print help and exit" echo "" From 7b8a05902b8522302892cb85335c9f06f31f976c Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 26 May 2021 05:01:18 -0400 Subject: [PATCH 15/18] spelling: the Signed-off-by: Josh Soref --- tools/sdk-readme-table-generator/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/sdk-readme-table-generator/README.md b/tools/sdk-readme-table-generator/README.md index 4859be694..f9b06a5ea 100644 --- a/tools/sdk-readme-table-generator/README.md +++ b/tools/sdk-readme-table-generator/README.md @@ -5,7 +5,7 @@ To generate the table of [SDK per check in build download table](https://github. 1. Edit the `inputBranches` in Program.fs when there is a new branch created. Make edits to table.fs if there are changes to the specific items or order you want showing up. 2. Run the program, it will generate the table with updated branch. It is not too smart, so if there is new platform added, we need more to change the program. But it is still better than edit it by hand. 3. Replace the table in the main readme file https://github.com/dotnet/installer/blob/main/README.md - NOTE: The output does not replace the entire file so you have to copy/paste over the pieces that are generated which is the middle of hte file + NOTE: The output does not replace the entire file so you have to copy/paste over the pieces that are generated which is the middle of the file 4. Run tests and update the tests I wrote it to learn F#, since it is almost the "99 bottle of beer" kata. Please point out places I can improve if you are interested. From d7f6b149d851ec4e177e182efce9a1f28095e426 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 26 May 2021 05:01:28 -0400 Subject: [PATCH 16/18] spelling: transform Signed-off-by: Josh Soref --- src/redist/targets/packaging/windows/clisdk/generatemsi.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/packaging/windows/clisdk/generatemsi.ps1 b/src/redist/targets/packaging/windows/clisdk/generatemsi.ps1 index 8e3f2b965..bfddd68a8 100644 --- a/src/redist/targets/packaging/windows/clisdk/generatemsi.ps1 +++ b/src/redist/targets/packaging/windows/clisdk/generatemsi.ps1 @@ -28,7 +28,7 @@ function RunHeat # -t $StableFileIdForApphostTransform to avoid sign check baseline apphost.exe name changes every build. Sign check uses File Id in MSI as exception list name. # Template apphost.exe get a new "File Id" in msi different every time (since File Id is generated according to file # path, and file path has version number) - # use XSLT tranform to match the file path contains "AppHostTemplate\apphost.exe" and give it the same ID all the time. + # use XSLT transform to match the file path contains "AppHostTemplate\apphost.exe" and give it the same ID all the time. $heatOutput = .\heat.exe dir `"$inputDir`" -template fragment ` -sreg -ag ` From b6273e1ec735451474586df5563b09d98465dd1e Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 26 May 2021 05:01:29 -0400 Subject: [PATCH 17/18] spelling: upgradability Signed-off-by: Josh Soref --- src/redist/targets/GetRuntimeInformation.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/GetRuntimeInformation.targets b/src/redist/targets/GetRuntimeInformation.targets index 045a5d30a..7d75f8f10 100644 --- a/src/redist/targets/GetRuntimeInformation.targets +++ b/src/redist/targets/GetRuntimeInformation.targets @@ -33,7 +33,7 @@ dotnet-standard-support-vs2015-$(Version)-$(ProductMonikerRid) $(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(Version)-$(ProductMonikerRid) + Changing "ProductBandCombinedHostHostFxrFrameworkSdkName" mid-product-band will break the upgradability of the SDK bundle installer. --> Dotnet SDK Bundle Installer $(CliProductBandVersion) $(ProductMonikerRid) $(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(Version)-$(Architecture) From 19a0e52351a9193618ff0e7c542a4fdc269f20ef Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 26 May 2021 05:01:30 -0400 Subject: [PATCH 18/18] spelling: using Signed-off-by: Josh Soref --- eng/common/internal/Tools.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/common/internal/Tools.csproj b/eng/common/internal/Tools.csproj index f46d5efe2..987103232 100644 --- a/eng/common/internal/Tools.csproj +++ b/eng/common/internal/Tools.csproj @@ -7,7 +7,7 @@ false - +