diff options
| author | David Wrighton <davidwr@microsoft.com> | 2017-09-29 09:47:51 -0700 |
|---|---|---|
| committer | David Wrighton <davidwr@microsoft.com> | 2017-09-29 09:47:51 -0700 |
| commit | 09d436a7ab467ad561d8c954c2622988be33f57b (patch) | |
| tree | dd7b8d79605b1bfa6a8589c414a8fe32173a146f /dir.props | |
| parent | be5e1a1baff7dbb1e1cefd2304152b1c6f3e39d5 (diff) | |
| parent | c8a49ac3abce30092f51e397136098f9cdd9ba5f (diff) | |
| download | coreclr-09d436a7ab467ad561d8c954c2622988be33f57b.tar.gz coreclr-09d436a7ab467ad561d8c954c2622988be33f57b.tar.bz2 coreclr-09d436a7ab467ad561d8c954c2622988be33f57b.zip | |
Merge branch 'master' into merge_master
Diffstat (limited to 'dir.props')
| -rw-r--r-- | dir.props | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Condition="Exists('..\dir.props')" Project="..\dir.props" /> - + <!-- $(OS) is set to Unix/Windows_NT. This comes from an environment variable on Windows and MSBuild on Unix. --> @@ -24,7 +24,7 @@ <!-- Switching to the .NET Core version of the BuildTools tasks seems to break numerous scenarios, such as VS intellisense and resource designer - as well as runnning the build on mono. Until we can get these sorted out we will continue using the .NET 4.5 version of the tasks. + as well as running the build on mono. Until we can get these sorted out we will continue using the .NET 4.5 version of the tasks. --> <PropertyGroup> <RunningOnCore>false</RunningOnCore> @@ -55,7 +55,7 @@ <SourceDir>$(__SourceDir)\</SourceDir> <SourceDir Condition="'$(__SourceDir)'==''">$(ProjectDir)src\</SourceDir> - <!-- This name is used to create a GIT reposiitory URL https://github.com/dotnet/$(GitHubRepositoryName) used to find source code for debugging --> + <!-- This name is used to create a GIT repository URL https://github.com/dotnet/$(GitHubRepositoryName) used to find source code for debugging --> <GitHubRepositoryName Condition="'$(GitHubRepositoryName)' == ''">coreclr</GitHubRepositoryName> <PackagesDir>$(__PackagesDir)\</PackagesDir> @@ -66,7 +66,7 @@ <BinDir>$(__BinDir)\</BinDir> <BinDir Condition="'$(__BinDir)'==''">$(RootBinDir)Product\$(BuildOS).$(BuildArch).$(BuildType)\</BinDir> - + <__IntermediatesDir Condition="'$(__IntermediatesDir)' == ''">$(RootBinDir)obj\$(BuildOS).$(BuildArch).$(BuildType)</__IntermediatesDir> <IntermediateOutputRootPath Condition="'$(IntermediateOutputRootPath)' == ''">$(__IntermediatesDir)\</IntermediateOutputRootPath> @@ -141,7 +141,7 @@ <ReleaseNotes>https://go.microsoft.com/fwlink/?LinkID=799421</ReleaseNotes> <ProjectUrl>https://dot.net</ProjectUrl> - + <!-- On Windows, MSbuild still runs against Desktop FX while it runs on .NET Core on non-Windows. this requires pulling in different packaging dependencies. --> @@ -152,7 +152,7 @@ <MinOSForArch>win7</MinOSForArch> <MinOSForArch Condition="'$(PackagePlatform)' == 'arm'">win8</MinOSForArch> <MinOSForArch Condition="'$(PackagePlatform)' == 'arm64'">win10</MinOSForArch> - <!-- This property must be set to disable local package installation --> + <!-- This property must be set to disable local package installation --> <SkipInstallLocallyBuiltPackages>true</SkipInstallLocallyBuiltPackages> <!-- Define packaging attributes for cross target components --> |