Skip to content
This repository was archived by the owner on Apr 20, 2023. It is now read-only.

fix typo #9364

Merged
merged 2 commits into from
Jun 1, 2018
Merged

fix typo #9364

merged 2 commits into from
Jun 1, 2018

Conversation

mairaw
Copy link

@mairaw mairaw commented May 30, 2018

No description provided.

@mairaw
Copy link
Author

mairaw commented Jun 1, 2018

@johnbeisner @livarcocc should I merge this myself? Or do you guys merge this?

@johnbeisner johnbeisner merged commit 7ce4777 into dotnet:master Jun 1, 2018
livarcocc added a commit to livarcocc/cli-1 that referenced this pull request Jun 8, 2018
* master: (31 commits)
  Updating signing project to use new intermediate directory (int).
  Update runtimeconfig.json doc for 2.1 (dotnet#9382)
  Shortening the path to the intermediate folder by renaming it to int.
  fix typo (dotnet#9364)
  Updating asp.net to 2.2.0 as well.
  Updating the build and tests to work with the 2.2.0 runtime.
  Simplified combining dictionaries in Telemetry
  Fixing 'Channel' and 'BranchName': "release/2.1.4xx" to "master" (dotnet#9362)
  Fix extraction of folders (dotnet#9335)
  Update Sha256Hasher.cs
  Fix relative path tool path (dotnet#9330)
  Insert updated SDK from 2.1.4xx branch
  MSBuild 15.8.60
  Fix crash when user home directory cannot be determined.
  Make `CliFolderPathCalculator` a static class.
  Don't add the ReleaseSuffix to the branding on the CLI when DropSuffix is set to true.
  Add retry when Directory.Move (dotnet#9313)
  Override new SdkResult public properties
  Add reference to Microsoft.Build.NuGetSdkResolver
  Disable crossgen for MSBuild inline-task refs
  ...

	README.md
	build/BranchInfo.props
	build/BundledTemplates.props
	build/DependencyVersions.props
	build/Version.props
	src/redist/redist.csproj
	test/EndToEnd/GivenAspNetAppsResolveImplicitVersions.cs
	tools/CrossGen.Dependencies/CrossGen.Dependencies.csproj
@mairaw mairaw deleted the mairaw-patch-1 branch June 29, 2018 04:44
dotnet-maestro-bot pushed a commit to dotnet-maestro-bot/cli that referenced this pull request Aug 7, 2018
…e_master_cli

* 'master' of /Users/livarcocc/Documents/git/cli: (1063 commits)
  Updating signing project to use new intermediate directory (int).
  Update runtimeconfig.json doc for 2.1 (dotnet#9382)
  Shortening the path to the intermediate folder by renaming it to int.
  fix typo (dotnet#9364)
  Updating asp.net to 2.2.0 as well.
  Updating the build and tests to work with the 2.2.0 runtime.
  Simplified combining dictionaries in Telemetry
  Fixing 'Channel' and 'BranchName': "release/2.1.4xx" to "master" (dotnet#9362)
  Fix extraction of folders (dotnet#9335)
  Update Sha256Hasher.cs
  Fix relative path tool path (dotnet#9330)
  Insert updated SDK from 2.1.4xx branch
  MSBuild 15.8.60
  Fix crash when user home directory cannot be determined.
  Make `CliFolderPathCalculator` a static class.
  Don't add the ReleaseSuffix to the branding on the CLI when DropSuffix is set to true.
  Add retry when Directory.Move (dotnet#9313)
  Override new SdkResult public properties
  Add reference to Microsoft.Build.NuGetSdkResolver
  Disable crossgen for MSBuild inline-task refs
  ...
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants