diff --git a/Documentation/cli-installation-scenarios.md b/Documentation/cli-installation-scenarios.md index d028a45af..fa7f68223 100644 --- a/Documentation/cli-installation-scenarios.md +++ b/Documentation/cli-installation-scenarios.md @@ -422,7 +422,7 @@ ADD HKLM\SOFTWARE\WOW6432Node\dotnet\Setup\InstalledVersions\x86\sdk\[REG_DWORD] Installing 1.1.0-567890 (RTM) which is incompatible since 1.0.2 -Note: User is unable to run apps targetting 1.0.1 or 1.0.2 until compatible version is installed. +Note: User is unable to run apps targeting 1.0.1 or 1.0.2 until compatible version is installed. ``` NOP HKLM\SOFTWARE\WOW6432Node\dotnet\Setup\InstalledVersions\x86\sdk\[REG_DWORD]1.0.0-rc1=1 @@ -445,7 +445,7 @@ ADD HKLM\SOFTWARE\WOW6432Node\dotnet\Setup\InstalledVersions\x86\sdk\[REG_DWORD] Installing 1.0.0-rc2-123456 to a clean machine -Note: User is unable to run apps targetting 1.0.0 until RTM is installed. +Note: User is unable to run apps targeting 1.0.0 until RTM is installed. ``` ADD HKLM\SOFTWARE\WOW6432Node\dotnet\Setup\InstalledVersions\x86\sdk\[REG_DWORD]1.0.0-rc1=1 @@ -455,7 +455,7 @@ ADD HKLM\SOFTWARE\WOW6432Node\dotnet\Setup\InstalledVersions\x86\sdk\[REG_DWORD] Installing 1.0.1-rc1-234567 -Note: User is still unable to run apps targetting 1.0.0 until any 1.0.0+ RTM is installed. +Note: User is still unable to run apps targeting 1.0.0 until any 1.0.0+ RTM is installed. ``` NOP HKLM\SOFTWARE\WOW6432Node\dotnet\Setup\InstalledVersions\x86\sdk\[REG_DWORD]1.0.0-rc1=1 diff --git a/README.md b/README.md index d1223ed6b..e0c2f74eb 100644 --- a/README.md +++ b/README.md @@ -33,9 +33,9 @@ This project has adopted the code of conduct defined by the [Contributor Covenan Build Status ------------ -|Ubuntu 14.04 / Linux Mint 17 |Ubuntu 16.04 |Debian 8.2 |Windows x64 |Windows x86 |Mac OS X |CentOS 7.1 / Oracle Linux 7.1 |RHEL 7.2 |OpenSUSE 13.2 |Fedora 23| -|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:| -|[![][ubuntu-14.04-build-badge]][ubuntu-14.04-build]|[![][ubuntu-16.04-build-badge]][ubuntu-16.04-build]|[![][debian-8.2-build-badge]][debian-8.2-build]|[![][win-x64-build-badge]][win-x64-build]|[![][win-x86-build-badge]][win-x86-build]|[![][osx-build-badge]][osx-build]|[![][centos-build-badge]][centos-build]|[![][rhel-build-badge]][rhel-build]|[![][opensuse-13.2-build-badge]][opensuse-13.2-build]|[![][fedora-23-build-badge]][fedora-23-build]| +|Ubuntu 14.04 / Linux Mint 17 |Ubuntu 16.04 |Debian 8.2 |Windows x64 |Windows x86 |Mac OS X |CentOS 7.1 / Oracle Linux 7.1 |RHEL 7.2 | +|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:| +|[![][ubuntu-14.04-build-badge]][ubuntu-14.04-build]|[![][ubuntu-16.04-build-badge]][ubuntu-16.04-build]|[![][debian-8.2-build-badge]][debian-8.2-build]|[![][win-x64-build-badge]][win-x64-build]|[![][win-x86-build-badge]][win-x86-build]|[![][osx-build-badge]][osx-build]|[![][centos-build-badge]][centos-build]|[![][rhel-build-badge]][rhel-build]| [win-x64-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5449/badge [win-x64-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5449 @@ -61,12 +61,6 @@ Build Status [rhel-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5446/badge [rhel-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5446 -[opensuse-13.2-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5444/badge -[opensuse-13.2-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5444 - -[fedora-23-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5443/badge -[fedora-23-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5443 - Installers and Binaries ----------------------- @@ -87,14 +81,12 @@ In order to download just the .NET Core runtime without the SDK, please visit ht | **Mac OS X** | [Installer][osx-installer] - [Checksum][osx-installer-checksum]
[tar.gz][osx-targz] - [Checksum][osx-targz-checksum] | | **CentOS 7.1 / Oracle Linux 7** | [tar.gz][centos-targz] - [Checksum][centos-targz-checksum] | | **RHEL 7.2** | [tar.gz][rhel-targz] - [Checksum][rhel-targz-checksum] | -| **openSUSE 13.2** | [tar.gz][opensuse-13.2-targz] - [Checksum][opensuse-13.2-targz-checksum] | -| **Fedora 23** | [tar.gz][fedora-23-targz] - [Checksum][fedora-23-targz-checksum] | *Note: Our Debian packages are put together slightly differently than the other OS specific installers. Instead of combining everything, we have separate component packages that depend on each other. If you're installing these directly from the .deb files (via dpkg or similar), then you'll need to install the [corresponding Host, Host FX Resolver, and Shared Framework packages](https://github.com/dotnet/core-setup#daily-builds) before installing the Sdk package.* [version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/latest.version [comment]: # (The latest versions are always the same across all platforms. Just need one to show, so picking win-x64's svg.) -[version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/Windows_x64_Release_version_badge.svg +[version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/win_x64_Release_version_badge.svg [win-x64-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-win-x64.latest.exe [win-x64-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-win-x64.latest.exe.sha @@ -128,12 +120,6 @@ In order to download just the .NET Core runtime without the SDK, please visit ht [rhel-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-rhel-x64.latest.tar.gz [rhel-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-rhel-x64.latest.tar.gz.sha -[opensuse-13.2-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-opensuse.13.2-x64.latest.tar.gz -[opensuse-13.2-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-opensuse.13.2-x64.latest.tar.gz.sha - -[fedora-23-targz]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-fedora.23-x64.latest.tar.gz -[fedora-23-targz-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-dev-fedora.23-x64.latest.tar.gz.sha - Docker ------ diff --git a/TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj b/TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj index a5487baba..4096632bd 100644 --- a/TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj +++ b/TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj @@ -3,7 +3,7 @@ netcoreapp1.0;net451 Exe $(PackageTargetFallback);portable-net45+win8;dnxcore50 - win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.23-x64;opensuse.13.2-x64 + win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64 diff --git a/TestAssets/TestPackages/PackageWithFakeNativeDep/PackageWithFakeNativeDep.csproj b/TestAssets/TestPackages/PackageWithFakeNativeDep/PackageWithFakeNativeDep.csproj index 6f9d59cfe..57c97bd00 100644 --- a/TestAssets/TestPackages/PackageWithFakeNativeDep/PackageWithFakeNativeDep.csproj +++ b/TestAssets/TestPackages/PackageWithFakeNativeDep/PackageWithFakeNativeDep.csproj @@ -2,7 +2,7 @@ net45 PackageWithFakeNativeDep - win7-x64;win7-x86;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.23-x64;opensuse.13.2-x64;osx.10.10-x64;rhel.7-x64 + win7-x64;win7-x86;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;osx.10.10-x64;rhel.7-x64 diff --git a/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj index 02db5109d..908965e3b 100644 --- a/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj +++ b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj @@ -9,7 +9,7 @@ $(CLI_SharedFrameworkVersion) dotnet-hello Exe - win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.23-x64;opensuse.13.2-x64 + win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64 diff --git a/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj b/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj index f71ccbede..065c24d50 100644 --- a/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj +++ b/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj @@ -9,7 +9,7 @@ $(CLI_SharedFrameworkVersion) dotnet-hello Exe - win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.23-x64;opensuse.13.2-x64 + win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64 diff --git a/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj b/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj index f4bc3f4d1..ae3c52dfb 100644 --- a/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj +++ b/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj @@ -2,7 +2,7 @@ Exe netcoreapp1.0 - win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.23-x64;opensuse.13.2-x64 + win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64 diff --git a/build/Branding.props b/build/Branding.props index 21ae2d473..a11613cd0 100644 --- a/build/Branding.props +++ b/build/Branding.props @@ -12,7 +12,7 @@ Microsoft.NETCore.App $(SharedFrameworkName) - $(Rid) + $(Rid) $(OSName)-$(Architecture) dotnet-sdk diff --git a/build/Compile.targets b/build/Compile.targets index 2010fa6b3..d48bc1ff6 100644 --- a/build/Compile.targets +++ b/build/Compile.targets @@ -1,17 +1,9 @@ - - - - - + BuildProjectsForNuGetPackages;" /> @@ -21,87 +13,5 @@ - - - - - - - u=rw,g=r,o=r - - - - - u=rwx,g=rx,o=rx - - - - - u=rwx,g=rx,o=rx - - - - - - - - - - - - - - - - - - - - - - - - - - CLIBuildDll=$(CLIBuildDll); - NuGetPackagesDir=$(NuGetPackagesDir); - SdkLayoutDirectory=$(SdkOutputDirectory)/Sdks/%(BundledSdk.Identity); - SdkPackageName=%(BundledSdk.Identity); - SdkPackageVersion=%(BundledSdk.Version); - Stage0Directory=$(Stage0Directory) - - - - - - - - - - - - - TemplateLayoutDirectory=$(SdkOutputDirectory)/Templates; - TemplatePackageName=%(BundledTemplate.Identity); - TemplatePackageVersion=%(BundledTemplate.Version); - Stage0Directory=$(Stage0Directory) - - - - - - diff --git a/build/Prepare.targets b/build/Prepare.targets index b29d8737d..22212ab6e 100644 --- a/build/Prepare.targets +++ b/build/Prepare.targets @@ -2,8 +2,6 @@ - - diff --git a/build/Test.targets b/build/Test.targets index f86cb01ea..9eca40552 100644 --- a/build/Test.targets +++ b/build/Test.targets @@ -65,7 +65,8 @@ + ProjectPath=""$(TestDirectory)/Microsoft.DotNet.Cli.Tests.sln"" + MaxCpuCount="1" /> $(OSName)_$(Architecture) - Ubuntu_16_04_x64 - Fedora_23_x64 - openSUSE_13_2_x64 + ubuntu_16_04_x64 $(BaseOutputDirectory)/$(VersionBadgeMoniker)_$(Configuration)_version_badge.svg diff --git a/build/compile/LzmaArchive.targets b/build/compile/LzmaArchive.targets index 61c22c8b5..77155e5da 100644 --- a/build/compile/LzmaArchive.targets +++ b/build/compile/LzmaArchive.targets @@ -111,8 +111,7 @@ - + diff --git a/build/publish/FinishBuild.targets b/build/publish/FinishBuild.targets index 206e131f2..ab0873ec5 100644 --- a/build/publish/FinishBuild.targets +++ b/build/publish/FinishBuild.targets @@ -8,7 +8,8 @@ + NugetVersion="$(FullNugetVersion)" + VersionBadgeMoniker="$(VersionBadgeMoniker)"> diff --git a/build_projects/dotnet-cli-build/CheckIfAllBuildsHavePublished.cs b/build_projects/dotnet-cli-build/CheckIfAllBuildsHavePublished.cs index cfeb125a1..db3cbd396 100644 --- a/build_projects/dotnet-cli-build/CheckIfAllBuildsHavePublished.cs +++ b/build_projects/dotnet-cli-build/CheckIfAllBuildsHavePublished.cs @@ -26,6 +26,9 @@ namespace Microsoft.DotNet.Cli.Build [Required] public string NugetVersion { get; set; } + [Required] + public string VersionBadgeMoniker { get; set; } + [Output] public string HaveAllBuildsPublished { get; set; } @@ -46,22 +49,19 @@ namespace Microsoft.DotNet.Cli.Build { var badges = new Dictionary() { - { "Windows_x86", false }, - { "Windows_x64", false }, - { "Ubuntu_x64", false }, - { "Ubuntu_16_04_x64", false }, - { "RHEL_x64", false }, - { "OSX_x64", false }, - { "Debian_x64", false }, - { "CentOS_x64", false }, - { "Fedora_23_x64", false }, - { "openSUSE_13_2_x64", false } + { "win_x86", false }, + { "win_x64", false }, + { "ubuntu_x64", false }, + { "ubuntu_16_04_x64", false }, + { "rhel_x64", false }, + { "osx_x64", false }, + { "debian_x64", false }, + { "centos_x64", false }, }; - var versionBadgeName = $"{Monikers.GetBadgeMoniker()}"; - if (!badges.ContainsKey(versionBadgeName)) + if (!badges.ContainsKey(VersionBadgeMoniker)) { - throw new ArgumentException($"A new OS build '{versionBadgeName}' was added without adding the moniker to the {nameof(badges)} lookup"); + throw new ArgumentException($"A new OS build '{VersionBadgeMoniker}' was added without adding the moniker to the {nameof(badges)} lookup"); } IEnumerable blobs = AzurePublisherTool.ListBlobs(AzurePublisher.Product.Sdk, NugetVersion); diff --git a/build_projects/dotnet-cli-build/Chmod.cs b/build_projects/dotnet-cli-build/Chmod.cs index 736c60c34..1d87e93c7 100644 --- a/build_projects/dotnet-cli-build/Chmod.cs +++ b/build_projects/dotnet-cli-build/Chmod.cs @@ -9,27 +9,13 @@ namespace Microsoft.DotNet.Cli.Build public class Chmod : ToolTask { [Required] - public string File { get; set; } + public string Glob { get; set; } [Required] public string Mode { get; set; } public bool Recursive { get; set; } - protected override bool ValidateParameters() - { - base.ValidateParameters(); - - if (!System.IO.File.Exists(File)) - { - Log.LogError($"File '{File} does not exist."); - - return false; - } - - return true; - } - protected override string ToolName { get { return "chmod"; } @@ -47,12 +33,12 @@ namespace Microsoft.DotNet.Cli.Build protected override string GenerateCommandLineCommands() { - return $"{GetRecursive()} {GetMode()} {GetFilePath()}"; + return $"{GetRecursive()} {GetMode()} {GetGlob()}"; } - private string GetFilePath() + private string GetGlob() { - return File; + return Glob; } private string GetMode() diff --git a/build_projects/dotnet-cli-build/GetCurrentRuntimeInformation.cs b/build_projects/dotnet-cli-build/GetCurrentRuntimeInformation.cs index dbbeaa0de..5d58cb5f9 100644 --- a/build_projects/dotnet-cli-build/GetCurrentRuntimeInformation.cs +++ b/build_projects/dotnet-cli-build/GetCurrentRuntimeInformation.cs @@ -3,6 +3,7 @@ using Microsoft.Build.Framework; using Microsoft.Build.Utilities; +using Microsoft.DotNet.Cli.Build.Framework; using Microsoft.DotNet.PlatformAbstractions; namespace Microsoft.DotNet.Cli.Build @@ -22,9 +23,25 @@ namespace Microsoft.DotNet.Cli.Build { Rid = RuntimeEnvironment.GetRuntimeIdentifier(); Architecture = RuntimeEnvironment.RuntimeArchitecture; - OSName = Monikers.GetOSShortName(); + OSName = GetOSShortName(); return true; } + + private static string GetOSShortName() + { + string osname = ""; + switch (CurrentPlatform.Current) + { + case BuildPlatform.Windows: + osname = "win"; + break; + default: + osname = CurrentPlatform.Current.ToString().ToLower(); + break; + } + + return osname; + } } } \ No newline at end of file diff --git a/build_projects/shared-build-targets-utils/Utils/Monikers.cs b/build_projects/shared-build-targets-utils/Utils/Monikers.cs deleted file mode 100644 index 2c4b8e69e..000000000 --- a/build_projects/shared-build-targets-utils/Utils/Monikers.cs +++ /dev/null @@ -1,43 +0,0 @@ -using Microsoft.DotNet.Cli.Build.Framework; -using Microsoft.DotNet.PlatformAbstractions; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace Microsoft.DotNet.Cli.Build -{ - public class Monikers - { - public static string GetBadgeMoniker() - { - switch (RuntimeEnvironment.GetRuntimeIdentifier()) - { - case "ubuntu.16.04-x64": - return "Ubuntu_16_04_x64"; - case "fedora.23-x64": - return "Fedora_23_x64"; - case "opensuse.13.2-x64": - return "openSUSE_13_2_x64"; - } - - return $"{CurrentPlatform.Current}_{CurrentArchitecture.Current}"; - } - - public static string GetOSShortName() - { - string osname = ""; - switch (CurrentPlatform.Current) - { - case BuildPlatform.Windows: - osname = "win"; - break; - default: - osname = CurrentPlatform.Current.ToString().ToLower(); - break; - } - - return osname; - } - } -} diff --git a/dir.props b/dir.props index 1c28a15e9..8d31ff867 100644 --- a/dir.props +++ b/dir.props @@ -20,6 +20,8 @@ + + diff --git a/netci.groovy b/netci.groovy index 8a2698aab..cc510c646 100644 --- a/netci.groovy +++ b/netci.groovy @@ -9,7 +9,7 @@ def project = GithubProject def branch = GithubBranchName def isPR = true -def platformList = ['Debian8.2:x64:Debug', 'Ubuntu:x64:Release', 'Ubuntu16.04:x64:Debug', 'OSX:x64:Release', 'Windows_NT:x64:Release', 'Windows_NT:x86:Debug', 'RHEL7.2:x64:Release', 'CentOS7.1:x64:Debug', 'Fedora23:x64:Debug', 'OpenSUSE13.2:x64:Debug'] +def platformList = ['Debian8.2:x64:Debug', 'Ubuntu:x64:Release', 'Ubuntu16.04:x64:Debug', 'OSX:x64:Release', 'Windows_NT:x64:Release', 'Windows_NT:x86:Debug', 'RHEL7.2:x64:Release', 'CentOS7.1:x64:Debug'] def static getBuildJobName(def configuration, def os, def architecture) { return configuration.toLowerCase() + '_' + os.toLowerCase() + '_' + architecture.toLowerCase() diff --git a/src/dotnet/MsbuildProject.cs b/src/dotnet/MsbuildProject.cs index 414ebf4cb..bceeb144d 100644 --- a/src/dotnet/MsbuildProject.cs +++ b/src/dotnet/MsbuildProject.cs @@ -174,7 +174,7 @@ namespace Microsoft.DotNet.Tools return false; } - public bool IsTargettingFramework(NuGetFramework framework) + public bool IsTargetingFramework(NuGetFramework framework) { foreach (var tfm in GetTargetFrameworks()) { diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-package/LocalizableStrings.cs b/src/dotnet/commands/dotnet-add/dotnet-add-package/LocalizableStrings.cs index af46e172f..be30b3d2f 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-package/LocalizableStrings.cs +++ b/src/dotnet/commands/dotnet-add/dotnet-add-package/LocalizableStrings.cs @@ -13,7 +13,7 @@ namespace Microsoft.DotNet.Tools.Add.PackageReference public const string SpecifyExactlyOnePackageReference = "Please specify only one package reference to be added."; - public const string CmdFrameworkDescription = "Adds reference only when targetting a specific framework."; + public const string CmdFrameworkDescription = "Adds reference only when targeting a specific framework."; public const string CmdNoRestoreDescription = "Adds reference without performing restore preview and compatibility check."; diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-reference/LocalizableStrings.cs b/src/dotnet/commands/dotnet-add/dotnet-add-reference/LocalizableStrings.cs index 5689cebf2..0e87d24bd 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-reference/LocalizableStrings.cs +++ b/src/dotnet/commands/dotnet-add/dotnet-add-reference/LocalizableStrings.cs @@ -11,6 +11,6 @@ namespace Microsoft.DotNet.Tools.Add.ProjectToProjectReference public const string AppHelpText = "Project to project references to add"; - public const string CmdFrameworkDescription = "Add reference only when targetting a specific framework"; + public const string CmdFrameworkDescription = "Add reference only when targeting a specific framework"; } } diff --git a/src/dotnet/commands/dotnet-add/dotnet-add-reference/Program.cs b/src/dotnet/commands/dotnet-add/dotnet-add-reference/Program.cs index b041d83ff..aef1d216d 100644 --- a/src/dotnet/commands/dotnet-add/dotnet-add-reference/Program.cs +++ b/src/dotnet/commands/dotnet-add/dotnet-add-reference/Program.cs @@ -74,7 +74,7 @@ namespace Microsoft.DotNet.Tools.Add.ProjectToProjectReference else { var framework = NuGetFramework.Parse(frameworkString); - if (!msbuildProj.IsTargettingFramework(framework)) + if (!msbuildProj.IsTargetingFramework(framework)) { Reporter.Error.WriteLine(string.Format( CommonLocalizableStrings.ProjectDoesNotTargetFramework, diff --git a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/LocalizableStrings.cs b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/LocalizableStrings.cs index 30c459246..de954c2d8 100644 --- a/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/LocalizableStrings.cs +++ b/src/dotnet/commands/dotnet-remove/dotnet-remove-reference/LocalizableStrings.cs @@ -11,6 +11,6 @@ namespace Microsoft.DotNet.Tools.Remove.ProjectToProjectReference public const string AppHelpText = "Project to project references to remove"; - public const string CmdFrameworkDescription = "Remove reference only when targetting a specific framework"; + public const string CmdFrameworkDescription = "Remove reference only when targeting a specific framework"; } } diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index 5044398c5..95aa96d4a 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -1,7 +1,8 @@  - + + $(CliVersionPrefix) netcoreapp2.0 @@ -23,12 +24,6 @@ - - - - - - @@ -110,6 +105,51 @@ AssetPath="%(NuPkgContentForMSBuildExtensionsRelativePaths.Identity)" /> + + + + + CLIBuildDll=$(CLIBuildDll); + NuGetPackagesDir=$(NuGetPackagesDir); + SdkLayoutDirectory=$(SdkOutputDirectory)/Sdks/%(BundledSdk.Identity); + SdkPackageName=%(BundledSdk.Identity); + SdkPackageVersion=%(BundledSdk.Version); + Stage0Directory=$(Stage0Directory) + + + + + + + + + + + + + TemplateLayoutDirectory=$(SdkOutputDirectory)/Templates; + TemplatePackageName=%(BundledTemplate.Identity); + TemplatePackageVersion=%(BundledTemplate.Version); + Stage0Directory=$(Stage0Directory) + + + + + + + + + + + @@ -144,8 +184,8 @@ + Glob="$(CrossgenPath)" + Mode="u+x" /> + + + + <_VbcPath Include="$(PublishDir)/**/vbc.exe" /> + + + + + + + + + + + + + + + <_AllSdkFiles Include="$(PublishDir)/**/*" /> + + + + + + + + + + + + diff --git a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateScripts.cs b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateScripts.cs index 9122551db..73b749c2b 100644 --- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateScripts.cs +++ b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateScripts.cs @@ -223,7 +223,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests } [Fact] - public void MigratingScriptsWithMultiTFMCreatesTargetWithIsCrossTargettingBuildNotEqualTrueCondition() + public void MigratingScriptsWithMultiTFMCreatesTargetWithIsCrosstargetingBuildNotEqualTrueCondition() { var scriptMigrationRule = new MigrateScriptsRule(); ProjectRootElement mockProj = ProjectRootElement.Create(); @@ -241,7 +241,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests } [Fact] - public void MigratingScriptsWithSingleTFMDoesNotCreateTargetWithIsCrossTargettingBuild() + public void MigratingScriptsWithSingleTFMDoesNotCreateTargetWithIsCrosstargetingBuild() { var scriptMigrationRule = new MigrateScriptsRule(); ProjectRootElement mockProj = ProjectRootElement.Create(); diff --git a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateTFMs.cs b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateTFMs.cs index 11557ceac..4d7b60096 100644 --- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateTFMs.cs +++ b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateTFMs.cs @@ -15,7 +15,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests { public class GivenThatIWantToMigrateTFMs : TestBase { - [Fact(Skip="Emitting this until x-targetting full support is in")] + [Fact(Skip="Emitting this until x-targeting full support is in")] public void MigratingNetcoreappProjectDoesNotPopulateTargetFrameworkIdentifierAndTargetFrameworkVersion() { var testDirectory = Temp.CreateDirectory().Path; diff --git a/test/dotnet-add-reference.Tests/GivenDotnetAddReference.cs b/test/dotnet-add-reference.Tests/GivenDotnetAddReference.cs index 4a7ab7fe0..0f71da16c 100644 --- a/test/dotnet-add-reference.Tests/GivenDotnetAddReference.cs +++ b/test/dotnet-add-reference.Tests/GivenDotnetAddReference.cs @@ -23,7 +23,7 @@ Arguments: Options: -h|--help Show help information - -f|--framework Add reference only when targetting a specific framework + -f|--framework Add reference only when targeting a specific framework Additional Arguments: Project to project references to add diff --git a/test/dotnet-remove-reference.Tests/GivenDotnetRemoveP2P.cs b/test/dotnet-remove-reference.Tests/GivenDotnetRemoveP2P.cs index f4b5e831b..793330431 100644 --- a/test/dotnet-remove-reference.Tests/GivenDotnetRemoveP2P.cs +++ b/test/dotnet-remove-reference.Tests/GivenDotnetRemoveP2P.cs @@ -22,7 +22,7 @@ Arguments: Options: -h|--help Show help information - -f|--framework Remove reference only when targetting a specific framework + -f|--framework Remove reference only when targeting a specific framework Additional Arguments: Project to project references to remove diff --git a/tools/CrossGen.Dependencies/CrossGen.Dependencies.csproj b/tools/CrossGen.Dependencies/CrossGen.Dependencies.csproj index 82aebedc1..8ae84a8ff 100644 --- a/tools/CrossGen.Dependencies/CrossGen.Dependencies.csproj +++ b/tools/CrossGen.Dependencies/CrossGen.Dependencies.csproj @@ -3,7 +3,7 @@ netcoreapp2.0 - win7-x64;win7-x86;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.23-x64;opensuse.13.2-x64;osx.10.10-x64;rhel.7-x64 + win7-x64;win7-x86;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;osx.10.10-x64;rhel.7-x64