Skip to content

Commit c3a8f72

Browse files
marcpopMSFTmarcpopMSFT
authored
fix typos (#43730)
2 parents 33217f1 + 000b73c commit c3a8f72

File tree

12 files changed

+47
-47
lines changed

12 files changed

+47
-47
lines changed

‎documentation/project-docs/repro-helix-failure.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ cd C:\helix\payload-dir
3939
REM HELIX_CORRELATION_PAYLOAD would be set to correlation payload by real helix machine
4040
set HELIX_CORRELATION_PAYLOAD=C:\helix\localHelixTestLayout
4141
42-
REM "true" is full framework test. Without "true", it is dotnet core tests. RunTestsOnHelix.cmd is the same script will setup the helix environnement.
42+
REM "true" is full framework test. Without "true", it is dotnet core tests. RunTestsOnHelix.cmd is the same script will setup the helix environment.
4343
C:\helix\localHelixTestLayout\t\RunTestsOnHelix.cmd true
4444
```
4545

‎src/Cli/dotnet/SudoEnvironmentDirectoryOverride.cs

+5-5
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,15 @@ private static void CopyUserNuGetConfigToOverriddenHome(string homeBeforeOverrid
5555
.Select(fileName => Path.Combine(userSettingsDir, fileName))
5656
.FirstOrDefault(f => File.Exists(f));
5757

58-
var overridenSettingsDir = NuGetEnvironment.GetFolderPath(NuGetFolderPath.UserSettingsDirectory);
59-
var overridenNugetConfig = Path.Combine(overridenSettingsDir, Settings.DefaultSettingsFileName);
58+
var overriddenSettingsDir = NuGetEnvironment.GetFolderPath(NuGetFolderPath.UserSettingsDirectory);
59+
var overriddenNugetConfig = Path.Combine(overriddenSettingsDir, Settings.DefaultSettingsFileName);
6060

61-
if (File.Exists(overridenNugetConfig))
61+
if (File.Exists(overriddenNugetConfig))
6262
{
6363
try
6464
{
6565
FileAccessRetrier.RetryOnIOException(
66-
() => File.Delete(overridenNugetConfig));
66+
() => File.Delete(overriddenNugetConfig));
6767
}
6868
catch
6969
{
@@ -76,7 +76,7 @@ private static void CopyUserNuGetConfigToOverriddenHome(string homeBeforeOverrid
7676
try
7777
{
7878
FileAccessRetrier.RetryOnIOException(
79-
() => File.Copy(userNuGetConfig, overridenNugetConfig, overwrite: true));
79+
() => File.Copy(userNuGetConfig, overriddenNugetConfig, overwrite: true));
8080
}
8181
catch
8282
{

‎src/Cli/dotnet/commands/dotnet-publish/PublishCommandParser.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ internal static class PublishCommandParser
1818
Arity = ArgumentArity.ZeroOrMore
1919
};
2020

21-
public static readonly CliOption<string> OuputOption = new ForwardedOption<string>("--output", "-o")
21+
public static readonly CliOption<string> OutputOption = new ForwardedOption<string>("--output", "-o")
2222
{
2323
Description = LocalizableStrings.OutputOptionDescription,
2424
HelpName = LocalizableStrings.OutputOption
@@ -67,7 +67,7 @@ private static CliCommand ConstructCommand()
6767
command.Arguments.Add(SlnOrProjectArgument);
6868
RestoreCommandParser.AddImplicitRestoreOptions(command, includeRuntimeOption: false, includeNoDependenciesOption: true);
6969

70-
command.Options.Add(OuputOption);
70+
command.Options.Add(OutputOption);
7171
command.Options.Add(CommonOptions.ArtifactsPathOption);
7272
command.Options.Add(ManifestOption);
7373
command.Options.Add(NoBuildOption);

‎src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.ScopedCss.5_0.targets

+2-2
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ Integration with static web assets:
8888
</ResolveScopedCssOutputsDependsOn>
8989

9090
<!-- When used as a reference, the app will have been built before and as a result the list of static web assets will include the bundle
91-
instead of the individual files. We need to correct that in GetCopyToOuputDirectoryItems -->
91+
instead of the individual files. We need to correct that in GetCopyToOutputDirectoryItems -->
9292

9393
<GetCurrentProjectStaticWebAssetsDependsOn Condition="'$(DisableScopedCssBundling)' != 'true'">
9494
$(GetCurrentProjectStaticWebAssetsDependsOn);
@@ -219,7 +219,7 @@ Integration with static web assets:
219219
<_ScopedCssProjectBundleContentRoot>$(_ScopedCssIntermediatePath)projectbundle\</_ScopedCssProjectBundleContentRoot>
220220
<_ScopedCssProjectOutputPath>$(_ScopedCssIntermediatePath)projectbundle\$(PackageId).bundle.scp.css</_ScopedCssProjectOutputPath>
221221
<_ScopedCssProjectOutputFullPath>$([System.IO.Path]::Combine('$(MSBuildProjectFileDirectory)', '$(_ScopedCssIntermediatePath)projectbundle\$(PackageId).bundle.scp.css'))</_ScopedCssProjectOutputFullPath>
222-
<!-- We want the scoped css bundle path to always point to the root path of the app, overriding the default base path unless it is not explicitly overriden
222+
<!-- We want the scoped css bundle path to always point to the root path of the app, overriding the default base path unless it is not explicitly overridden
223223
by the user. This is so that when you are developing a server-side application or in the future potentially an ASP.NET application using css isolation,
224224
you don't have to make the urls in your files relative to "_content/$(PackageId).styles.css".
225225
If the user chooses to override the base path explicitly, we place the bundle at the root of the defined base path, this allows Blazor WebAssembly applications to be hosted

‎src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.ScopedCss.targets

+1-1
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ Integration with static web assets:
218218
<_ScopedCssProjectBundleContentRoot>$(_ScopedCssIntermediatePath)projectbundle\</_ScopedCssProjectBundleContentRoot>
219219
<_ScopedCssProjectOutputPath>$(_ScopedCssIntermediatePath)projectbundle\$(PackageId).bundle.scp.css</_ScopedCssProjectOutputPath>
220220
<_ScopedCssProjectOutputFullPath>$([System.IO.Path]::Combine('$(MSBuildProjectFileDirectory)', '$(_ScopedCssIntermediatePath)projectbundle\$(PackageId).bundle.scp.css'))</_ScopedCssProjectOutputFullPath>
221-
<!-- We want the scoped css bundle path to always point to the root path of the app, overriding the default base path unless it is not explicitly overriden
221+
<!-- We want the scoped css bundle path to always point to the root path of the app, overriding the default base path unless it is not explicitly overridden
222222
by the user. This is so that when you are developing a server-side application or in the future potentially an ASP.NET application using css isolation,
223223
you don't have to make the urls in your files relative to "_content/$(PackageId).styles.css".
224224
If the user chooses to override the base path explicitly, we place the bundle at the root of the defined base path, this allows Blazor WebAssembly applications to be hosted

‎src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets

+2-2
Original file line numberDiff line numberDiff line change
@@ -312,11 +312,11 @@ Copyright (c) .NET Foundation. All rights reserved.
312312

313313
<!-- Find all files in the final output directory. -->
314314
<FindUnderPath Path="$(_NormalizedPublishDir)" Files="@(_UnfilteredAbsolutePriorPublishFileWrites)" UpdateToAbsolutePaths="true">
315-
<Output TaskParameter="InPath" ItemName="_PriorPublishFileWritesInOuput"/>
315+
<Output TaskParameter="InPath" ItemName="_PriorPublishFileWritesInOutput"/>
316316
</FindUnderPath>
317317

318318
<!-- Remove duplicates from files produced in the previous publish. -->
319-
<RemoveDuplicates Inputs="@(_PriorPublishFileWritesInOuput)" >
319+
<RemoveDuplicates Inputs="@(_PriorPublishFileWritesInOutput)" >
320320
<Output TaskParameter="Filtered" ItemName="_PriorPublishFileWrites"/>
321321
</RemoveDuplicates>
322322

‎src/WebSdk/Publish/Tasks/MsDeploy/CommonUtility.cs

+5-5
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ internal enum SqlCommandVariableMetaData
141141
}
142142

143143

144-
internal enum ExistingParameterValiationMetadata
144+
internal enum ExistingParameterValidationMetadata
145145
{
146146
Element,
147147
Kind,
@@ -943,7 +943,7 @@ public static void AddDeclarParameterToOptions(/*VSMSDeploySyncOption*/ dynamic
943943
if (item != null && vSMSDeploySyncOption != null)
944944
{
945945
string name = item.ItemSpec;
946-
string elemment = item.GetMetadata(ExistingParameterValiationMetadata.Element.ToString());
946+
string elemment = item.GetMetadata(ExistingParameterValidationMetadata.Element.ToString());
947947
if (string.IsNullOrEmpty(elemment))
948948
elemment = "parameterEntry";
949949
string kind = item.GetMetadata(DeclareParameterMetadata.Kind.ToString());
@@ -989,7 +989,7 @@ public static void AddDeclarParameterToOptions(/*VSMSDeploySyncOption*/ dynamic
989989
{
990990
// this is bogus assertion because by default msdeploy always setup the validation which is never be null
991991
// System.Diagnostics.Debug.Assert(deploymentSyncParameter.Validation == null, "deploymentSyncParameter.Validation is already set");
992-
string validationString = item.GetMetadata(ExistingParameterValiationMetadata.ValidationString.ToString());
992+
string validationString = item.GetMetadata(ExistingParameterValidationMetadata.ValidationString.ToString());
993993

994994
object validationKindNone = MSWebDeploymentAssembly.DynamicAssembly.GetEnumValue("Microsoft.Web.Deployment.DeploymentSyncParameterValidationKind", "None");
995995
dynamic validationKind = validationKindNone;
@@ -1335,10 +1335,10 @@ public static void AddSetParametersVsMsDeployObject(MsDeploy.VSMSDeployObject sr
13351335
string description = item.GetMetadata(SyncParameterMetadata.Description.ToString());
13361336
string defaultValue = item.GetMetadata(SyncParameterMetadata.DefaultValue.ToString());
13371337
string tags = item.GetMetadata(SyncParameterMetadata.Tags.ToString());
1338-
string element = item.GetMetadata(ExistingParameterValiationMetadata.Element.ToString());
1338+
string element = item.GetMetadata(ExistingParameterValidationMetadata.Element.ToString());
13391339
if (string.IsNullOrEmpty(element))
13401340
element = "parameterEntry";
1341-
string validationString = item.GetMetadata(ExistingParameterValiationMetadata.ValidationString.ToString());
1341+
string validationString = item.GetMetadata(ExistingParameterValidationMetadata.ValidationString.ToString());
13421342

13431343

13441344
if (string.IsNullOrEmpty(value))

‎src/WebSdk/Publish/Tasks/Tasks/MsDeploy/CreateParameterFile.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,13 @@ public bool IncludeDefaultValue
6666
private static readonly string[] s_setParameterAttributes = { SyncParameterMetadata.Description.ToString().ToLowerInvariant(),
6767
SyncParameterMetadata.Value.ToString().ToLowerInvariant(),
6868
SyncParameterMetadata.Tags.ToString().ToLowerInvariant(),};
69-
private static readonly string[] s_parameterEntryIdentities = { ExistingParameterValiationMetadata.Element.ToString().ToLowerInvariant(),
69+
private static readonly string[] s_parameterEntryIdentities = { ExistingParameterValidationMetadata.Element.ToString().ToLowerInvariant(),
7070
ExistingDeclareParameterMetadata.Kind.ToString().ToLowerInvariant(),
7171
ExistingDeclareParameterMetadata.Scope.ToString().ToLowerInvariant(),
7272
ExistingDeclareParameterMetadata.Match.ToString().ToLowerInvariant(),};
7373

74-
private static readonly string[] s_parameterValidationIdentities = { ExistingParameterValiationMetadata.Element.ToString().ToLowerInvariant(),
75-
ExistingParameterValiationMetadata.Kind.ToString().ToLowerInvariant(),
74+
private static readonly string[] s_parameterValidationIdentities = { ExistingParameterValidationMetadata.Element.ToString().ToLowerInvariant(),
75+
ExistingParameterValidationMetadata.Kind.ToString().ToLowerInvariant(),
7676
"validationString",};
7777

7878
/// <summary>
@@ -132,7 +132,7 @@ private static void WriteDeclareParametersToFile(Utilities.TaskLoggingHelper log
132132
}
133133
if (parameterElement != null)
134134
{
135-
string elementValue = item.GetMetadata(ExistingParameterValiationMetadata.Element.ToString());
135+
string elementValue = item.GetMetadata(ExistingParameterValidationMetadata.Element.ToString());
136136
if (string.IsNullOrEmpty(elementValue))
137137
elementValue = "parameterEntry";
138138

‎src/WebSdk/Publish/Tasks/Tasks/MsDeploy/MSDeploy.cs

+10-10
Original file line numberDiff line numberDiff line change
@@ -191,9 +191,9 @@ duration of a remote operation
191191
private Framework.ITaskItem[] m_skipRuleItemsITaskItem = null;
192192
private Framework.ITaskItem[] m_declareParameterItems = null;
193193
private Framework.ITaskItem[] m_importDeclareParametersItems = null;
194-
private Framework.ITaskItem[] m_simpleSetParamterItems = null;
194+
private Framework.ITaskItem[] m_simpleSetParameterItems = null;
195195
private Framework.ITaskItem[] m_importSetParametersItems = null;
196-
private Framework.ITaskItem[] m_setParamterItems = null;
196+
private Framework.ITaskItem[] m_setParameterItems = null;
197197

198198

199199
private bool m_previewOnly = false;
@@ -456,15 +456,15 @@ public Framework.ITaskItem[] ImportSetParametersItems
456456

457457
public Framework.ITaskItem[] SimpleSetParameterItems
458458
{
459-
get { return m_simpleSetParamterItems; }
460-
set { m_simpleSetParamterItems = value; }
459+
get { return m_simpleSetParameterItems; }
460+
set { m_simpleSetParameterItems = value; }
461461
}
462462

463463

464464
public Framework.ITaskItem[] SetParameterItems
465465
{
466-
get { return m_setParamterItems; }
467-
set { m_setParamterItems = value; }
466+
get { return m_setParameterItems; }
467+
set { m_setParameterItems = value; }
468468
}
469469

470470
public Framework.ITaskItem[] AdditionalDestinationProviderOptions { get; set; }
@@ -648,7 +648,7 @@ public static void AddDeclareParameterToCommandArgument(System.Collections.Gener
648648
string name = item.ItemSpec;
649649
if (!string.IsNullOrEmpty(name))
650650
{
651-
string element = item.GetMetadata(ExistingParameterValiationMetadata.Element.ToString());
651+
string element = item.GetMetadata(ExistingParameterValidationMetadata.Element.ToString());
652652
if (string.IsNullOrEmpty(element))
653653
element = "parameterEntry";
654654
if (string.Compare(element, "parameterEntry", StringComparison.OrdinalIgnoreCase) == 0)
@@ -783,7 +783,7 @@ public static void AddSetParametersToObject(Utilities.CommandLineBuilder command
783783
string name = item.ItemSpec;
784784
if (!string.IsNullOrEmpty(name))
785785
{
786-
string element = item.GetMetadata(ExistingParameterValiationMetadata.Element.ToString());
786+
string element = item.GetMetadata(ExistingParameterValidationMetadata.Element.ToString());
787787
if (string.IsNullOrEmpty(element))
788788
element = "parameterEntry";
789789

@@ -1014,8 +1014,8 @@ protected override string GenerateCommandLineCommands()
10141014
AddDeclareParametersOptions(commandLine, m_declareParameterItems, m_strValueQuote, OptimisticParameterDefaultValue);
10151015

10161016
AddImportSetParametersFilesOptions(commandLine, m_importSetParametersItems);
1017-
AddSimpleSetParametersToObject(commandLine, m_simpleSetParamterItems, m_strValueQuote, OptimisticParameterDefaultValue);
1018-
AddSetParametersToObject(commandLine, m_setParamterItems, m_strValueQuote, OptimisticParameterDefaultValue);
1017+
AddSimpleSetParametersToObject(commandLine, m_simpleSetParameterItems, m_strValueQuote, OptimisticParameterDefaultValue);
1018+
AddSetParametersToObject(commandLine, m_setParameterItems, m_strValueQuote, OptimisticParameterDefaultValue);
10191019

10201020
if (m_xml) commandLine.AppendSwitch("-xml");
10211021
if (m_whatif) commandLine.AppendSwitch("-whatif");

‎src/WebSdk/Publish/Tasks/Tasks/MsDeploy/VsMsdeploy.cs

+6-6
Original file line numberDiff line numberDiff line change
@@ -592,9 +592,9 @@ public class VSMSDeploy : Utilities.Task, IVSMSDeployHost, Framework.ICancelable
592592
private Framework.ITaskItem[] m_skipRuleItemsITaskItem = null;
593593
private Framework.ITaskItem[] m_declareParameterItems = null;
594594
private Framework.ITaskItem[] m_importDeclareParametersItems = null;
595-
private Framework.ITaskItem[] m_simpleSetParamterItems = null;
595+
private Framework.ITaskItem[] m_simpleSetParameterItems = null;
596596
private Framework.ITaskItem[] m_importSetParametersItems = null;
597-
private Framework.ITaskItem[] m_setParamterItems = null;
597+
private Framework.ITaskItem[] m_setParameterItems = null;
598598

599599
private BaseMSDeployDriver m_msdeployDriver = null;
600600

@@ -730,8 +730,8 @@ public Framework.ITaskItem[] ImportDeclareParametersItems
730730

731731
public Framework.ITaskItem[] SimpleSetParameterItems
732732
{
733-
get { return m_simpleSetParamterItems; }
734-
set { m_simpleSetParamterItems = value; }
733+
get { return m_simpleSetParameterItems; }
734+
set { m_simpleSetParameterItems = value; }
735735
}
736736

737737
public Framework.ITaskItem[] ImportSetParametersItems
@@ -742,8 +742,8 @@ public Framework.ITaskItem[] ImportSetParametersItems
742742

743743
public Framework.ITaskItem[] SetParameterItems
744744
{
745-
get { return m_setParamterItems; }
746-
set { m_setParamterItems = value; }
745+
get { return m_setParameterItems; }
746+
set { m_setParameterItems = value; }
747747
}
748748

749749
public bool EnableMSDeployBackup { get; set; }

‎test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmPublishIntegrationTest.cs

+6-6
Original file line numberDiff line numberDiff line change
@@ -1207,7 +1207,7 @@ public void Publish_HostedApp_WithRidSpecifiedInCLI_Works()
12071207
var publishCommand = CreatePublishCommand(testInstance, "blazorhosted");
12081208
ExecuteCommand(publishCommand, "/p:RuntimeIdentifier=linux-x64").Should().Pass();
12091209

1210-
AssertRIDPublishOuput(publishCommand, testInstance, hosted: true);
1210+
AssertRIDPublishOutput(publishCommand, testInstance, hosted: true);
12111211
}
12121212

12131213
[ConditionalFact()]
@@ -1243,7 +1243,7 @@ public void Publish_HostedApp_WithRidSpecifiedAsArgument_NoSelfContained_Works()
12431243
publishCommand.WithWorkingDirectory(Path.Combine(testInstance.TestRoot, "blazorhosted"));
12441244
var result = ExecuteCommand(publishCommand, "--no-self-contained");
12451245
result.Should().Pass();
1246-
AssertRIDPublishOuput(publishCommand, testInstance, hosted: true, selfContained: false);
1246+
AssertRIDPublishOutput(publishCommand, testInstance, hosted: true, selfContained: false);
12471247
}
12481248

12491249
[Fact]
@@ -1269,7 +1269,7 @@ public void Publish_HostedApp_WithRidSpecifiedAsArgument_Works()
12691269
var result = ExecuteCommand(publishCommand, "--self-contained");
12701270

12711271
result.Should().Pass();
1272-
AssertRIDPublishOuput(publishCommand, testInstance, hosted: true);
1272+
AssertRIDPublishOutput(publishCommand, testInstance, hosted: true);
12731273
}
12741274

12751275
[Fact]
@@ -1292,10 +1292,10 @@ public void Publish_HostedApp_WithRid_Works()
12921292
var publishCommand = CreatePublishCommand(testInstance, "blazorhosted");
12931293
ExecuteCommand(publishCommand).Should().Pass();
12941294

1295-
AssertRIDPublishOuput(publishCommand, testInstance, hosted: true);
1295+
AssertRIDPublishOutput(publishCommand, testInstance, hosted: true);
12961296
}
12971297

1298-
private void AssertRIDPublishOuput(PublishCommand command, TestAsset testInstance, bool hosted = false)
1298+
private void AssertRIDPublishOutput(PublishCommand command, TestAsset testInstance, bool hosted = false)
12991299
{
13001300
var publishDirectory = command.GetOutputDirectory(DefaultTfm, "Debug", "linux-x64");
13011301

@@ -1375,7 +1375,7 @@ private void AssertRIDPublishOuput(PublishCommand command, TestAsset testInstanc
13751375
assetsManifestPath: "custom-service-worker-assets.js");
13761376
}
13771377

1378-
private void AssertRIDPublishOuput(DotnetPublishCommand command, TestAsset testInstance, bool hosted = false, bool selfContained = true)
1378+
private void AssertRIDPublishOutput(DotnetPublishCommand command, TestAsset testInstance, bool hosted = false, bool selfContained = true)
13791379
{
13801380
var publishDirectory = command.GetOutputDirectory(DefaultTfm, "Release", "linux-x64");
13811381

0 commit comments

Comments
 (0)