Skip to content

Commit

Permalink
Fix typos (#2476)
Browse files Browse the repository at this point in the history
* accross -> across

* additon -> addition

* typo

* atrribute -> attribute

* Concatanate -> Concatenate

* Definitons -> Definitions

* depdencies -> dependencies

* dependencys -> dependencies

* Dependes -> Depends

* forinvalid -> for invalid

* Givent -> Given

* igored -> ignored

* implict -> implicit

* Implictly -> Implicitly

* includded -> included

* incrementaly -> incrementally

* libary -> library

* manfiest -> manifest

* metadat -> metadata

* msbuid -> msbuild

* optimizaiton -> optimization

* Packge -> Package

* Packges -> Packages

* pakage -> package

* proeprty -> property

* raferences -> references

* Remov -> Remove
  • Loading branch information
github-john-doe authored and nguerrera committed Aug 15, 2018
1 parent 9642bb9 commit 8af38bc
Show file tree
Hide file tree
Showing 23 changed files with 45 additions and 45 deletions.
4 changes: 2 additions & 2 deletions src/Tasks/Common/ConflictResolution/PlatformManifestReader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ public static IEnumerable<ConflictItem> LoadConflictItems(string manifestPath, L
yield break;
}

using (var manfiestStream = File.Open(manifestPath, FileMode.Open, FileAccess.Read, FileShare.Read | FileShare.Delete))
using (var manifestReader = new StreamReader(manfiestStream))
using (var manifestStream = File.Open(manifestPath, FileMode.Open, FileAccess.Read, FileShare.Read | FileShare.Delete))
using (var manifestReader = new StreamReader(manifestStream))
{
for (int lineNumber = 0; !manifestReader.EndOfStream; lineNumber++)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public class ResolvePackageFileConflicts : TaskBase
/// by which packages before doing any other conflict resolution.
/// </summary>
/// <remarks>
/// This is an optimizaiton so AssemblyVersions, FileVersions, etc. don't need to be read
/// This is an optimization so AssemblyVersions, FileVersions, etc. don't need to be read
/// in the default cases where platform packages (Microsoft.NETCore.App) should override specific packages
/// (System.Console v4.3.0).
/// </remarks>
Expand Down Expand Up @@ -165,7 +165,7 @@ protected override void ExecuteCore()

}

// Concatanate two things, either of which may be null. Interpret null as empty,
// Concatenate two things, either of which may be null. Interpret null as empty,
// and return null if the result would be empty.
private ITaskItem[] SafeConcat(ITaskItem[] first, IEnumerable<ITaskItem> second)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ private static ITaskItem[] GetPackageRefItems(List<PackageIdentity> packages)
metadata: new Dictionary<string, string> { { "Version", kvp.Version.ToString() } })).ToArray();

[Fact]
public void RemovDuplicatePackageReference()
public void RemoveDuplicatePackageReference()
{
var knownpackage = new List<PackageIdentity>();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,19 +55,19 @@ public void CopyMetadataTo(ITaskItem destinationItem)

public string GetMetadata(string metadataName)
{
string metadatValue = null;
if (_metadata.TryGetValue(metadataName, out metadatValue))
string metadataValue = null;
if (_metadata.TryGetValue(metadataName, out metadataValue))
{
return metadatValue;
return metadataValue;
}

return null;
}

public void RemoveMetadata(string metadataName)
{
string metadatValue = null;
if (_metadata.TryGetValue(metadataName, out metadatValue))
string metadataValue = null;
if (_metadata.TryGetValue(metadataName, out metadataValue))
{
_metadata.Remove(metadataName);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
namespace Microsoft.NET.Build.Tasks
{
/// <summary>
/// Aggregates the sdk specified as project items and implicit packages raferences.
/// Aggregates the sdk specified as project items and implicit packages references.
/// Note: this task is not used temporarily as a hack for RTM to be able to get all
/// implicit SDKs accross all TFMs. In U1 we will switch back to this task when multiple
/// implicit SDKs across all TFMs. In U1 we will switch back to this task when multiple
/// TFM support is added to Dependencies logic.
/// Tracking issue https://github.com/dotnet/roslyn-project-system/issues/587
/// </summary>
Expand Down
8 changes: 4 additions & 4 deletions src/Tasks/Microsoft.NET.Build.Tasks/FilterResolvedFiles.cs
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public ITaskItem[] AssembliesToPublish
get; private set;
}
[Output]
public ITaskItem[] PublishedPackges
public ITaskItem[] PublishedPackages
{
get; private set;
}
Expand All @@ -63,9 +63,9 @@ protected override void ExecuteCore()

var packageClosure = new HashSet<PackageIdentity>();

foreach ( var pakageItem in PackagesToPrune)
foreach ( var packageItem in PackagesToPrune)
{
var pkgName = pakageItem.ItemSpec;
var pkgName = packageItem.ItemSpec;
if (!string.IsNullOrEmpty(pkgName))
{
packageClosure.UnionWith(projectContext.GetTransitiveList(pkgName));
Expand All @@ -92,7 +92,7 @@ protected override void ExecuteCore()
item.SetMetadata("Version", resolvedPkg.Version.ToString());
_packagesResolved.Add(item);
}
PublishedPackges = _packagesResolved.ToArray();
PublishedPackages = _packagesResolved.ToArray();
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ private void PopulatePackages()
}

/// <summary>
/// Adds assemblies, analyzers and framework assemblies from FileDefinitons to dependencies world dictionary.
/// Adds assemblies, analyzers and framework assemblies from FileDefinitions to dependencies world dictionary.
/// </summary>
private void PopulateAssemblies()
{
Expand Down
6 changes: 3 additions & 3 deletions src/Tasks/Microsoft.NET.Build.Tasks/ResolvePackageAssets.cs
Original file line number Diff line number Diff line change
Expand Up @@ -849,10 +849,10 @@ bool hasTwoPeriods(string s)
if (_task.VerifyMatchingImplicitPackageVersion &&
_task.ExpectedPlatformPackages != null)
{
foreach (var implicitPackge in _task.ExpectedPlatformPackages)
foreach (var implicitPackage in _task.ExpectedPlatformPackages)
{
var packageName = implicitPackge.ItemSpec;
var expectedVersion = implicitPackge.GetMetadata(MetadataKeys.ExpectedVersion);
var packageName = implicitPackage.ItemSpec;
var expectedVersion = implicitPackage.GetMetadata(MetadataKeys.ExpectedVersion);

if (string.IsNullOrEmpty(packageName) ||
string.IsNullOrEmpty(expectedVersion) ||
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ Copyright (c) .NET Foundation. All rights reserved.
RuntimeIdentifier="$(RuntimeIdentifier)"
IsSelfContained="$(SelfContained)" >
<Output TaskParameter="AssembliesToPublish" ItemName="ResolvedFileToPublish" />
<Output TaskParameter="PublishedPackges" ItemName="PackagesThatWereResolved" />
<Output TaskParameter="PublishedPackages" ItemName="PackagesThatWereResolved" />
</FilterResolvedFiles>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@

namespace Microsoft.NET.Build.Tests
{
public class GiventThatWeManifestSupportedFrameworks : SdkTest
public class GivenThatWeManifestSupportedFrameworks : SdkTest
{
public GiventThatWeManifestSupportedFrameworks(ITestOutputHelper log) : base(log)
public GivenThatWeManifestSupportedFrameworks(ITestOutputHelper log) : base(log)
{
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.It_should_produce_same_SatelliteAssemblie_File
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

using System.IO;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public void It_builds_a_simple_desktop_app()
// If we set AnyCPU and do use native dependency, we get any CPU app that can't find its native dependency.
// Tests current behavior, but ideally we'd also raise a build diagnostic in this case: https://github.com/dotnet/sdk/issues/843
[InlineData("AnyCPUNative", "AnyCPU", true, "Native code failed (MSIL)")]
public void It_handles_native_depdencies_and_platform_target(
public void It_handles_native_dependencies_and_platform_target(
string identifier,
string platformTarget,
bool useNativeCode,
Expand Down Expand Up @@ -125,7 +125,7 @@ public void It_handles_native_depdencies_and_platform_target(
}

[WindowsOnlyTheory]
// implict rid with option to append rid to output path off -> do not append
// implicit rid with option to append rid to output path off -> do not append
[InlineData("implicitOff", "", false, false)]
// implicit rid with option to append rid to output path on -> do not append (never append implicit rid irrespective of option)
[InlineData("implicitOn", "", true, false)]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ public void It_does_not_include_netstandard_when_inbox(bool isSdk)
[WindowsOnlyTheory]
[InlineData(true)]
[InlineData(false)]
public void It_does_not_include_netstandard_when_libary_targets_netstandard14(bool isSdk)
public void It_does_not_include_netstandard_when_library_targets_netstandard14(bool isSdk)
{
var testAsset = _testAssetsManager
.CopyTestAsset(GetTemplateName(isSdk), identifier: isSdk.ToString())
Expand Down Expand Up @@ -383,7 +383,7 @@ public void It_does_not_include_netstandard_when_libary_targets_netstandard14(bo
[WindowsOnlyTheory]
[InlineData(true)]
[InlineData(false)]
public void It_includes_netstandard_when_libary_targets_netstandard15(bool isSdk)
public void It_includes_netstandard_when_library_targets_netstandard15(bool isSdk)
{
var testAsset = _testAssetsManager
.CopyTestAsset(GetTemplateName(isSdk), identifier: isSdk.ToString())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public void It_gets_implicit_designtime_facades_when_package_reference_uses_syst
// The repro here is very sensitive to the target framework and packages used. This specific case
// net46 using only System.Collections.Immutable v1.4.0 will not pull in System.Runtime from a
// package or from Microsoft.NET.Build.Extensions as a primary reference and so RARs dependency
// walk needs to find it in order for ImplictlyExpandDesignTimeFacades to inject it.
// walk needs to find it in order for ImplicitlyExpandDesignTimeFacades to inject it.

var netFrameworkLibrary = new TestProject()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -572,7 +572,7 @@ private void TestInvalidTargetFramework(string testName, string targetFramework,
else
{
// Intentionally not checking the error message on restore here as we can't put ourselves in front of
// restore and customize the message forinvalid target frameworks as that would break restoring packages
// restore and customize the message for invalid target frameworks as that would break restoring packages
// like MSBuild.Sdk.Extras that add support for extra TFMs.
restore.Should().Fail();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,7 @@ public void It_uses_lowercase_form_of_the_target_framework_for_the_output_path()
var testProject = new TestProject()
{
Name = "OutputPathCasing",
TargetFrameworks = "igored",
TargetFrameworks = "ignored",
IsSdkProject = true,
IsExe = true
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ public void It_respects_version_changes_on_incremental_build(string targetFramew
.Restore(Log, "", $"/p:OutputType=Library", $"/p:TargetFramework={targetFramework}");
BuildProject(versionPrefix: "1.2.3");

// When the same project is built again using a different VersionPrefix proeprty
// When the same project is built again using a different VersionPrefix property
var incrementalBuildCommand = BuildProject(versionPrefix: "1.2.4");

// Then the version of the built assembly shall match the provided VersionPrefix
Expand All @@ -324,7 +324,7 @@ BuildCommand BuildProject(string versionPrefix)
}

[Fact]
public void It_respects_custom_assembly_atrribute_items_on_incremental_build()
public void It_respects_custom_assembly_attribute_items_on_incremental_build()
{
var targetFramework = "netstandard1.5";
var testAsset = _testAssetsManager
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ public void It_does_not_include_facades_from_nuget_packages()
$"{testProject.Name}.exe.config",
$"{testProject.Name}.pdb",

// These two will be includded because Netstandard1.x has a higher version of these two contracts than net4.7.1 which is why they will be added.
// These two will be included because Netstandard1.x has a higher version of these two contracts than net4.7.1 which is why they will be added.
"System.Net.Http.dll",
"System.IO.Compression.dll",

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ public void Packing_a_netcoreapp_1_1_app_includes_the_implicit_dependency()
}

[WindowsOnlyFact]
public void Packing_an_app_exclude_dependencys_framework_assemblies_dependency()
public void Packing_an_app_exclude_dependencies_framework_assemblies_dependency()
{
TestProject testProject = new TestProject()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,21 +75,21 @@ public void It_does_not_fail_publishing_a_self_twice()
.CopyTestAsset(TestProjectName)
.WithSource();

var msbuidArgs = new string[] { "/p:SelfContained=true",
var msbuildArgs = new string[] { "/p:SelfContained=true",
$"/p:TargetFramework={TargetFramework}",
$"/p:RuntimeIdentifier={runtimeIdentifier}"};

var restoreCommand = new RestoreCommand(Log, testAsset.TestRoot);

restoreCommand.Execute(msbuidArgs);
restoreCommand.Execute(msbuildArgs);

var publishCommand = new PublishCommand(Log, testAsset.TestRoot);
publishCommand
.Execute(msbuidArgs)
.Execute(msbuildArgs)
.Should().Pass();

publishCommand
.Execute(msbuidArgs)
.Execute(msbuildArgs)
.Should().Pass().And.NotHaveStdOutContaining("HelloWorld.exe' already exists");
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -171,11 +171,11 @@ public void compose_multifile()

var OutputFolder = Path.Combine(simpleDependenciesAsset.TestRoot, "o");
var WorkingDir = Path.Combine(simpleDependenciesAsset.TestRoot, "w");
var additonalproj1 = Path.Combine(simpleDependenciesAsset.TestRoot, "NewtonsoftMultipleVersions.xml");
var additonalproj2 = Path.Combine(simpleDependenciesAsset.TestRoot, "FluentAssertion.xml");
var additionalproj1 = Path.Combine(simpleDependenciesAsset.TestRoot, "NewtonsoftMultipleVersions.xml");
var additionalproj2 = Path.Combine(simpleDependenciesAsset.TestRoot, "FluentAssertion.xml");

storeCommand
.Execute($"/p:RuntimeIdentifier={_runtimeRid}", $"/p:TargetFramework={_tfm}", $"/p:Additionalprojects={additonalproj1}%3b{additonalproj2}", $"/p:ComposeDir={OutputFolder}", $"/p:ComposeWorkingDir={WorkingDir}", "/p:DoNotDecorateComposeDir=true", "/p:CreateProfilingSymbols=false")
.Execute($"/p:RuntimeIdentifier={_runtimeRid}", $"/p:TargetFramework={_tfm}", $"/p:Additionalprojects={additionalproj1}%3b{additionalproj2}", $"/p:ComposeDir={OutputFolder}", $"/p:ComposeWorkingDir={WorkingDir}", "/p:DoNotDecorateComposeDir=true", "/p:CreateProfilingSymbols=false")
.Should()
.Pass();
DirectoryInfo storeDirectory = new DirectoryInfo(OutputFolder);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public void It_has_native_and_transitive_dependencies_dll(bool multiTarget)
.WithSource()
.WithProjectChanges(project =>
{
ChangeToPackageThatDependesOnOtherPackage(project);
ChangeToPackageThatDependsOnOtherPackage(project);

XNamespace ns = project.Root.Name.Namespace;
XElement propertyGroup = project.Root.Elements(ns + "PropertyGroup").First();
Expand Down Expand Up @@ -75,7 +75,7 @@ public void It_has_native_and_transitive_dependencies_dll(bool multiTarget)
}
}

private static void ChangeToPackageThatDependesOnOtherPackage(XDocument project)
private static void ChangeToPackageThatDependsOnOtherPackage(XDocument project)
{
XNamespace ns = project.Root.Name.Namespace;
XElement itemGroup = project.Root.Elements(ns + "ItemGroup").First();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ public void Clean_should_remove_bin_output(bool multiTarget)
[Theory]
[InlineData(true)]
[InlineData(false)]
public void Generate_shims_runs_incrementaly(bool multiTarget)
public void Generate_shims_runs_incrementally(bool multiTarget)
{
TestAsset helloWorldAsset = SetUpHelloWorld(multiTarget);

Expand Down

0 comments on commit 8af38bc

Please sign in to comment.