Merge pull request #7131 from dotnet/merges/release/2.0.0-to-master-20170712-070028
Merge release/2.0.0 to master
This commit is contained in:
Livar
GitHub
commit
a666297881
21 changed files with 66 additions and 78 deletions
46
README.md
46
README.md
|
|
@ -23,9 +23,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 | Ubuntu 16.10 |Debian 8 |Windows x64 |Windows x86 |macOS |CentOS 7.1 / Oracle Linux 7.1 |RHEL 7.2 | Linux x64 |
|
||||
|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:|
|
||||
|[![][ubuntu-14.04-build-badge]][ubuntu-14.04-build]|[![][ubuntu-16.04-build-badge]][ubuntu-16.04-build]|[![][ubuntu-16.10-build-badge]][ubuntu-16.10-build]|[![][debian-8-build-badge]][debian-8-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]|[![][linux-build-badge]][linux-build]|
|
||||
|Windows x64 |Windows x86 |Mac OS X |Linux x64 |Ubuntu 14.04 / Linux Mint 17 |Ubuntu 16.04 |Ubuntu 16.10 |Debian 8 |RHEL 7.2 |
|
||||
|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:|
|
||||
|[![][win-x64-build-badge]][win-x64-build]|[![][win-x86-build-badge]][win-x86-build]|[![][osx-build-badge]][osx-build]|[![][linux-build-badge]][linux-build]|[![][ubuntu-14.04-build-badge]][ubuntu-14.04-build]|[![][ubuntu-16.04-build-badge]][ubuntu-16.04-build]|[![][ubuntu-16.10-build-badge]][ubuntu-16.10-build]|[![][debian-8-build-badge]][debian-8-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
|
||||
|
|
@ -33,6 +33,12 @@ Build Status
|
|||
[win-x86-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5450/badge
|
||||
[win-x86-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5450
|
||||
|
||||
[osx-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5445/badge
|
||||
[osx-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5445
|
||||
|
||||
[linux-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5603/badge
|
||||
[linux-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5603
|
||||
|
||||
[ubuntu-14.04-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5447/badge
|
||||
[ubuntu-14.04-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5447
|
||||
|
||||
|
|
@ -45,18 +51,9 @@ Build Status
|
|||
[debian-8-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5442/badge
|
||||
[debian-8-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5442
|
||||
|
||||
[osx-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5445/badge
|
||||
[osx-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5445
|
||||
|
||||
[centos-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5441/badge
|
||||
[centos-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5441
|
||||
|
||||
[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
|
||||
|
||||
[linux-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5603/badge
|
||||
[linux-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5603
|
||||
|
||||
Installers and Binaries
|
||||
-----------------------
|
||||
|
||||
|
|
@ -67,27 +64,38 @@ In order to download just the .NET Core runtime without the SDK, please visit ht
|
|||
> **Note:** please be aware that below installers are the **latest bits**. If you
|
||||
> want to install the latest released versions, please check out the [section above](#looking-for-v1-of-the-net-core-tooling).
|
||||
|
||||
| Platform | master<br>[![][version-badge]][version] |
|
||||
| Platform | Latest Daily Build<br>*master*<br>[![][version-badge]][version] |
|
||||
| -------- | :-------------------------------------: |
|
||||
| **Windows x64** | [Installer][win-x64-installer] - [Checksum][win-x64-installer-checksum]<br>[zip][win-x64-zip] - [Checksum][win-x64-zip-checksum] |
|
||||
| **Windows x86** | [Installer][win-x86-installer] - [Checksum][win-x86-installer-checksum]<br>[zip][win-x86-zip] - [Checksum][win-x86-zip-checksum] |
|
||||
| **Mac OS X** | [Installer][osx-installer] - [Checksum][osx-installer-checksum]<br>[tar.gz][osx-targz] - [Checksum][osx-targz-checksum] |
|
||||
| **Linux x64** | [tar.gz][linux-targz] - [Checksum][linux-targz-checksum] |
|
||||
| **Ubuntu 14.04 / Linux Mint 17** | [Installer][ubuntu-14.04-installer] - [Checksum][ubuntu-14.04-installer-checksum]<br>*See Installer Note Below<br>tar.gz - See **Linux x64** |
|
||||
| **Ubuntu 16.04** | [Installer][ubuntu-16.04-installer] - [Checksum][ubuntu-16.04-installer-checksum]<br>*See Installer Note Below<br>tar.gz - See **Linux x64** |
|
||||
| **Ubuntu 16.10** | [Installer][ubuntu-16.10-installer] - [Checksum][ubuntu-16.10-installer-checksum]<br>*See Installer Note Below<br>tar.gz - See **Linux x64** |
|
||||
| **Debian 8** | [Installer][debian-8-installer] - [Checksum][debian-8-installer-checksum]<br>*See Installer Note Below<br>tar.gz - See **Linux x64** |
|
||||
| **Ubuntu 14.04 / Linux Mint 17** | [Installer][ubuntu-14.04-installer] - [Checksum][ubuntu-14.04-installer-checksum]<br>_see installer note below_<sup>1</sup><br>tar.gz - See **Linux x64** |
|
||||
| **Ubuntu 16.04** | [Installer][ubuntu-16.04-installer] - [Checksum][ubuntu-16.04-installer-checksum]<br>_see installer note below_<sup>1</sup><br>tar.gz - See **Linux x64** |
|
||||
| **Ubuntu 16.10** | [Installer][ubuntu-16.10-installer] - [Checksum][ubuntu-16.10-installer-checksum]<br>_see installer note below_<sup>1</sup><br>tar.gz - See **Linux x64** |
|
||||
| **Debian 8** | [Installer][debian-8-installer] - [Checksum][debian-8-installer-checksum]<br>_see installer note below_<sup>1</sup><br>tar.gz - See **Linux x64** |
|
||||
| **RHEL 7.2** | [Installer][rhel-7-installer] - [Checksum][rhel-7-installer-checksum]<br>_see installer note below_<sup>1</sup><br>tar.gz - See **Linux x64** |
|
||||
| **CentOS 7.1 / Oracle Linux 7** | tar.gz - See **Linux x64** |
|
||||
| **RHEL 7.2** | [Installer][rhel-7-installer] - [Checksum][rhel-7-installer-checksum]<br>*See Installer Note Below<br>tar.gz - See **Linux x64** |
|
||||
| **Fedora 24** | tar.gz - See **Linux x64** |
|
||||
| **OpenSUSE 42.1** | tar.gz - See **Linux x64** |
|
||||
|
||||
*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.*
|
||||
|
||||
| Latest Coherent Build<sup>2</sup><br>*release/2.0.0* |
|
||||
|:------:|
|
||||
| [![][coherent-version-badge]][coherent-version] |
|
||||
|
||||
Reference notes:
|
||||
> **1**: *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.*
|
||||
> <br><br>**2**: *A 'coherent' build is defined as a build where the Runtime version matches between the CLI and Asp.NET.*
|
||||
|
||||
[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/win_x64_Release_version_badge.svg
|
||||
|
||||
[coherent-version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/latest.coherent.version
|
||||
[comment]: # (The latest versions are always the same across all platforms. Just need one to show, so picking win-x64's svg.)
|
||||
[coherent-version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/win_x64_Release_coherent_badge.svg
|
||||
|
||||
[win-x64-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-win-x64.exe
|
||||
[win-x64-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-win-x64.exe.sha
|
||||
[win-x64-zip]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-win-x64.zip
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<CLI_SharedFrameworkVersion>2.0.0-preview3-25507-02</CLI_SharedFrameworkVersion>
|
||||
<CLI_SharedFrameworkVersion>2.0.0-preview3-25511-03</CLI_SharedFrameworkVersion>
|
||||
<CLI_MSBuild_Version>15.3.0-preview-000402-01</CLI_MSBuild_Version>
|
||||
<CLI_Roslyn_Version>2.3.0-beta4-61830-03</CLI_Roslyn_Version>
|
||||
<CLI_Roslyn_Satellites_Version>2.3.0-pre-20170624-6</CLI_Roslyn_Satellites_Version>
|
||||
|
|
@ -22,11 +22,11 @@
|
|||
<SharedFrameworkVersion>$(CLI_SharedFrameworkVersion)</SharedFrameworkVersion>
|
||||
<SharedHostVersion>$(CLI_SharedFrameworkVersion)</SharedHostVersion>
|
||||
<HostFxrVersion>$(CLI_SharedFrameworkVersion)</HostFxrVersion>
|
||||
<TemplateEngineVersion>1.0.0-beta2-20170707-280</TemplateEngineVersion>
|
||||
<TemplateEngineTemplateVersion>1.0.0-beta2-20170707-280</TemplateEngineTemplateVersion>
|
||||
<TemplateEngineTemplate2_0Version>1.0.0-beta2-20170707-280</TemplateEngineTemplate2_0Version>
|
||||
<PlatformAbstractionsVersion>2.0.0-preview3-25507-02</PlatformAbstractionsVersion>
|
||||
<DependencyModelVersion>2.0.0-preview3-25507-02</DependencyModelVersion>
|
||||
<TemplateEngineVersion>1.0.0-beta2-20170710-283</TemplateEngineVersion>
|
||||
<TemplateEngineTemplateVersion>1.0.0-beta2-20170710-283</TemplateEngineTemplateVersion>
|
||||
<TemplateEngineTemplate2_0Version>1.0.0-beta2-20170710-283</TemplateEngineTemplate2_0Version>
|
||||
<PlatformAbstractionsVersion>2.0.0-preview3-25511-03</PlatformAbstractionsVersion>
|
||||
<DependencyModelVersion>2.0.0-preview3-25511-03</DependencyModelVersion>
|
||||
<CliCommandLineParserVersion>0.1.1-alpha-167</CliCommandLineParserVersion>
|
||||
<CliMigrateVersion>1.2.1-alpha-002133</CliMigrateVersion>
|
||||
<MicroBuildVersion>0.2.0</MicroBuildVersion>
|
||||
|
|
@ -35,9 +35,9 @@
|
|||
|
||||
<!-- This should either be timestamped or notimestamp as appropriate -->
|
||||
<AspNetCoreRuntimePackageFlavor>timestamped</AspNetCoreRuntimePackageFlavor>
|
||||
<AspNetCoreRuntimeVersion>dev-270</AspNetCoreRuntimeVersion>
|
||||
<AspNetCoreRuntimeVersion>dev-277</AspNetCoreRuntimeVersion>
|
||||
<AspNetCoherenceLabel>rtm</AspNetCoherenceLabel>
|
||||
<AspNetCoreCoherenceTimestamp>26151</AspNetCoreCoherenceTimestamp>
|
||||
<AspNetCoreCoherenceTimestamp>26182</AspNetCoreCoherenceTimestamp>
|
||||
|
||||
</PropertyGroup>
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
</DebianUploadJsonContent>
|
||||
</PropertyGroup>
|
||||
|
||||
<Target Name="PublishDebFilesToDebianRepo" Condition=" '$(IsDebianBaseDistro)' == 'True' AND '$(SkipPublishToDebianRepo)' != 'true' ">
|
||||
<Target Name="PublishDebFilesToDebianRepo" Condition=" '$(IsDebianBaseDistro)' == 'True' AND '$(SkipPublishToDebianRepo)' != 'true' AND '$(IslinuxPortable)' != 'true' ">
|
||||
<Error Condition="'$(REPO_ID)' == ''" Text="REPO_ID must be set as an environment variable for debian publishing." />
|
||||
<Error Condition="'$(REPO_USER)' == ''" Text="REPO_USER must be set as an environment variable for debian publishing." />
|
||||
<Error Condition="'$(REPO_PASS)' == ''" Text="REPO_PASS must be set as an environment variable for debian publishing." />
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ namespace Microsoft.DotNet.Cli.Build
|
|||
{
|
||||
ToolPath = ToolPath,
|
||||
TemplateType = newArgs[0],
|
||||
TemplateArgs = newArgs[1] + $" --debug:ephemeral-hive -n TempProject -o \"{outputDir}\"",
|
||||
TemplateArgs = newArgs[1] + $" --debug:ephemeral-hive -n TempProject -o \"{outputDir}\" --no-restore",
|
||||
HostObject = HostObject,
|
||||
BuildEngine = BuildEngine
|
||||
};
|
||||
|
|
|
|||
|
|
@ -19,4 +19,4 @@ Installation Note
|
|||
--------------
|
||||
A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete."
|
||||
|
||||
dotnet new > /dev/null 2>&1 || true
|
||||
dotnet internal-reportinstallsuccess "debianpackage" > /dev/null 2>&1 || true
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@ INSTALL_DESTINATION=$2
|
|||
# A temporary fix for the permissions issue(s)
|
||||
chmod -R 755 $INSTALL_DESTINATION
|
||||
|
||||
# Run 'dotnet new' to trigger the first time experience to initialize the cache
|
||||
$INSTALL_DESTINATION/dotnet new > /dev/null 2>&1 || true
|
||||
$INSTALL_DESTINATION/dotnet internal-reportinstallsuccess "$1" > /dev/null 2>&1 || true
|
||||
|
||||
exit 0
|
||||
|
|
|
|||
|
|
@ -23,4 +23,4 @@ Installation Note
|
|||
--------------
|
||||
A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete."
|
||||
|
||||
dotnet new > /dev/null 2>&1 || true
|
||||
dotnet internal-reportinstallsuccess "rpmpackage" > /dev/null 2>&1 || true
|
||||
|
|
|
|||
|
|
@ -4,36 +4,10 @@
|
|||
#
|
||||
|
||||
# Dockerfile that creates a container suitable to build dotnet-cli
|
||||
FROM fedora:23
|
||||
|
||||
# Install the base toolchain we need to build anything (clang, cmake, make and the like)
|
||||
# this does not include libraries that we need to compile different projects, we'd like
|
||||
# them in a different layer.
|
||||
RUN dnf install -y cmake \
|
||||
clang \
|
||||
lldb-devel \
|
||||
make \
|
||||
which && \
|
||||
dnf clean all
|
||||
FROM microsoft/dotnet-buildtools-prereqs:fedora23_prereqs
|
||||
|
||||
# Install tools used by the VSO build automation.
|
||||
RUN dnf install -y git \
|
||||
zip \
|
||||
tar \
|
||||
nodejs \
|
||||
findutils \
|
||||
npm && \
|
||||
dnf clean all && \
|
||||
npm install -g azure-cli && \
|
||||
npm cache clean
|
||||
|
||||
# Dependencies of CoreCLR and CoreFX.
|
||||
RUN dnf install -y libicu-devel \
|
||||
libuuid-devel \
|
||||
libcurl-devel \
|
||||
openssl-devel \
|
||||
libunwind-devel \
|
||||
lttng-ust-devel && \
|
||||
RUN dnf install -y findutils && \
|
||||
dnf clean all
|
||||
|
||||
# Upgrade NSS, used for SSL, to avoid NuGet restore timeouts.
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ namespace Microsoft.DotNet.Tools.Migrate
|
|||
string outputDirectory,
|
||||
string workingDirectory)
|
||||
{
|
||||
RunCommand("new", new string[] { "console", "-o", workingDirectory, "--debug:ephemeral-hive" }, workingDirectory);
|
||||
RunCommand("new", new string[] { "console", "-o", workingDirectory, "--debug:ephemeral-hive", "--no-restore" }, workingDirectory);
|
||||
}
|
||||
private void RunCommand(string commandToExecute, IEnumerable<string> args, string workingDirectory)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -65,6 +65,7 @@
|
|||
<PackageReference Include="Microsoft.DotNet.ProjectJsonMigration" Version="$(CliMigrateVersion)" />
|
||||
<PackageReference Include="Microsoft.TemplateEngine.Abstractions" Version="$(TemplateEngineVersion)" />
|
||||
<PackageReference Include="Microsoft.TemplateEngine.Cli" Version="$(TemplateEngineVersion)" />
|
||||
<PackageReference Include="Microsoft.TemplateEngine.Cli.Localization" Version="$(TemplateEngineVersion)" />
|
||||
<PackageReference Include="Microsoft.TemplateEngine.Orchestrator.RunnableProjects" Version="$(TemplateEngineVersion)" />
|
||||
<PackageReference Include="Microsoft.TemplateEngine.Utils" Version="$(TemplateEngineVersion)" />
|
||||
<PackageReference Include="XliffTasks" Version="$(XliffTasksVersion)" PrivateAssets="All" />
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ namespace Microsoft.DotNet.Tests.EndToEnd
|
|||
{
|
||||
string projectDirectory = directory.Path;
|
||||
|
||||
string newArgs = "console -f netcoreapp2.0 --debug:ephemeral-hive";
|
||||
string newArgs = "console -f netcoreapp2.0 --debug:ephemeral-hive --no-restore";
|
||||
new NewCommandShim()
|
||||
.WithWorkingDirectory(projectDirectory)
|
||||
.Execute(newArgs)
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ Commands:
|
|||
|
||||
try
|
||||
{
|
||||
string args = $"classlib -o \"{projDir.Path}\" --debug:ephemeral-hive";
|
||||
string args = $"classlib -o \"{projDir.Path}\" --debug:ephemeral-hive --no-restore";
|
||||
new NewCommandShim()
|
||||
.WithWorkingDirectory(projDir.Path)
|
||||
.ExecuteWithCapturedOutput(args)
|
||||
|
|
|
|||
|
|
@ -93,7 +93,7 @@ namespace Microsoft.DotNet.Cli.Build.Tests
|
|||
string dir = "pkgs";
|
||||
string args = $"--packages {dir}";
|
||||
|
||||
string newArgs = $"console -f netcoreapp2.0 -o \"{rootPath}\" --debug:ephemeral-hive";
|
||||
string newArgs = $"console -f netcoreapp2.0 -o \"{rootPath}\" --debug:ephemeral-hive --no-restore";
|
||||
new NewCommandShim()
|
||||
.WithWorkingDirectory(rootPath)
|
||||
.Execute(newArgs)
|
||||
|
|
|
|||
|
|
@ -209,7 +209,7 @@ Commands:
|
|||
|
||||
try
|
||||
{
|
||||
string newArgs = $"classlib -o \"{dir.Path}\" --debug:ephemeral-hive";
|
||||
string newArgs = $"classlib -o \"{dir.Path}\" --debug:ephemeral-hive --no-restore";
|
||||
new NewCommandShim()
|
||||
.WithWorkingDirectory(dir.Path)
|
||||
.ExecuteWithCapturedOutput(newArgs)
|
||||
|
|
|
|||
|
|
@ -21,13 +21,13 @@ namespace Microsoft.DotNet.New.Tests
|
|||
|
||||
new NewCommand()
|
||||
.WithWorkingDirectory(rootPath)
|
||||
.Execute($"console --debug:ephemeral-hive");
|
||||
.Execute($"console --debug:ephemeral-hive --no-restore");
|
||||
|
||||
DateTime expectedState = Directory.GetLastWriteTime(rootPath);
|
||||
|
||||
var result = new NewCommand()
|
||||
.WithWorkingDirectory(rootPath)
|
||||
.ExecuteWithCapturedOutput($"console --debug:ephemeral-hive");
|
||||
.ExecuteWithCapturedOutput($"console --debug:ephemeral-hive --no-restore");
|
||||
|
||||
DateTime actualState = Directory.GetLastWriteTime(rootPath);
|
||||
|
||||
|
|
@ -64,7 +64,7 @@ namespace Microsoft.DotNet.New.Tests
|
|||
|
||||
new NewCommand()
|
||||
.WithWorkingDirectory(projectFolder)
|
||||
.Execute($"{projectType} --debug:ephemeral-hive")
|
||||
.Execute($"{projectType} --debug:ephemeral-hive --no-restore")
|
||||
.Should().Pass();
|
||||
|
||||
// https://github.com/dotnet/templating/issues/946 - remove DisableImplicitAssetTargetFallback once this is fixed.
|
||||
|
|
@ -87,7 +87,7 @@ namespace Microsoft.DotNet.New.Tests
|
|||
|
||||
new NewCommand()
|
||||
.WithWorkingDirectory(rootPath)
|
||||
.Execute($"{type} --name {projectName} -o . --debug:ephemeral-hive")
|
||||
.Execute($"{type} --name {projectName} -o . --debug:ephemeral-hive --no-restore")
|
||||
.Should().Pass();
|
||||
|
||||
new RestoreCommand()
|
||||
|
|
|
|||
|
|
@ -31,6 +31,10 @@ namespace Microsoft.DotNet.New.Tests
|
|||
[InlineData("F#", "mstest", false, false)]
|
||||
[InlineData("F#", "xunit", false, false)]
|
||||
[InlineData("F#", "mvc", true, false)]
|
||||
[InlineData("VB", "console", false, false)]
|
||||
[InlineData("VB", "classlib", false, false)]
|
||||
[InlineData("VB", "mstest", false, false)]
|
||||
[InlineData("VB", "xunit", false, false)]
|
||||
public void TemplateRestoresAndBuildsWithoutWarnings(
|
||||
string language,
|
||||
string projectType,
|
||||
|
|
@ -38,9 +42,11 @@ namespace Microsoft.DotNet.New.Tests
|
|||
bool skipSpaWebpackSteps)
|
||||
{
|
||||
string rootPath = TestAssets.CreateTestDirectory(identifier: $"{language}_{projectType}").FullName;
|
||||
//This works around the SPA templates not currently supporting the "--no-restore" switch
|
||||
string noRestoreDirective = skipSpaWebpackSteps ? "" : "--no-restore";
|
||||
|
||||
new TestCommand("dotnet") { WorkingDirectory = rootPath }
|
||||
.Execute($"new {projectType} -lang {language} -o {rootPath} --debug:ephemeral-hive")
|
||||
.Execute($"new {projectType} -lang {language} -o {rootPath} --debug:ephemeral-hive {noRestoreDirective}")
|
||||
.Should().Pass();
|
||||
|
||||
if (useNuGetConfigForAspNet)
|
||||
|
|
|
|||
|
|
@ -245,7 +245,7 @@ namespace Microsoft.DotNet.Tools.Pack.Tests
|
|||
string dir = "pkgs";
|
||||
string args = $"--packages {dir}";
|
||||
|
||||
string newArgs = $"console -o \"{rootPath}\"";
|
||||
string newArgs = $"console -o \"{rootPath}\" --no-restore";
|
||||
new NewCommandShim()
|
||||
.WithWorkingDirectory(rootPath)
|
||||
.Execute(newArgs)
|
||||
|
|
|
|||
|
|
@ -206,7 +206,7 @@ namespace Microsoft.DotNet.Cli.Publish.Tests
|
|||
string dir = "pkgs";
|
||||
string args = $"--packages {dir}";
|
||||
|
||||
string newArgs = $"console -o \"{rootPath}\"";
|
||||
string newArgs = $"console -o \"{rootPath}\" --no-restore";
|
||||
new NewCommandShim()
|
||||
.WithWorkingDirectory(rootPath)
|
||||
.Execute(newArgs)
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ Commands:
|
|||
|
||||
try
|
||||
{
|
||||
string newArgs = $"classlib -o \"{projDir.Path}\"";
|
||||
string newArgs = $"classlib -o \"{projDir.Path}\" --no-restore";
|
||||
new NewCommandShim()
|
||||
.WithWorkingDirectory(projDir.Path)
|
||||
.ExecuteWithCapturedOutput(newArgs)
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ namespace Microsoft.DotNet.Restore.Tests
|
|||
string dir = "pkgs";
|
||||
string fullPath = Path.GetFullPath(Path.Combine(rootPath, dir));
|
||||
|
||||
string newArgs = $"console -o \"{rootPath}\"";
|
||||
string newArgs = $"console -o \"{rootPath}\" --no-restore";
|
||||
new NewCommandShim()
|
||||
.WithWorkingDirectory(rootPath)
|
||||
.Execute(newArgs)
|
||||
|
|
@ -51,7 +51,7 @@ namespace Microsoft.DotNet.Restore.Tests
|
|||
string dir = "pkgs";
|
||||
string fullPath = Path.GetFullPath(Path.Combine(rootPath, dir));
|
||||
|
||||
string newArgs = $"classlib -o \"{rootPath}\"";
|
||||
string newArgs = $"classlib -o \"{rootPath}\" --no-restore";
|
||||
new NewCommandShim()
|
||||
.WithWorkingDirectory(rootPath)
|
||||
.Execute(newArgs)
|
||||
|
|
@ -98,7 +98,7 @@ namespace Microsoft.DotNet.Restore.Tests
|
|||
string dir = "pkgs";
|
||||
string fullPath = Path.GetFullPath(Path.Combine(rootPath, dir));
|
||||
|
||||
string newArgs = $"console -o \"{rootPath}\"";
|
||||
string newArgs = $"console -o \"{rootPath}\" --no-restore";
|
||||
new NewCommandShim()
|
||||
.WithWorkingDirectory(rootPath)
|
||||
.Execute(newArgs)
|
||||
|
|
|
|||
|
|
@ -198,7 +198,7 @@ namespace Microsoft.DotNet.Cli.Run.Tests
|
|||
string dir = "pkgs";
|
||||
string args = $"--packages {dir}";
|
||||
|
||||
string newArgs = $"console -o \"{rootPath}\"";
|
||||
string newArgs = $"console -o \"{rootPath}\" --no-restore";
|
||||
new NewCommandShim()
|
||||
.WithWorkingDirectory(rootPath)
|
||||
.Execute(newArgs)
|
||||
|
|
|
|||
Loading…
Reference in a new issue