mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Address code review

Browse source 
Use one version for cli migrate packages

as well as Nuget component packages

Rename CreateWithWith...
This commit is contained in:
William Li 2017-05-01 15:54:04 -07:00
parent 2ab4ac5454
commit 7154330432
10 changed files with 12 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

5
build/DependencyVersions.props
View file

@ -17,10 +17,7 @@
<PlatformAbstractionsVersion>2.0.0-preview2-002093</PlatformAbstractionsVersion> <PlatformAbstractionsVersion>2.0.0-preview2-002093</PlatformAbstractionsVersion>
<DependencyModelVersion>2.0.0-preview2-002093</DependencyModelVersion> <DependencyModelVersion>2.0.0-preview2-002093</DependencyModelVersion>
<CliCommandLineParserVersion>0.1.0-alpha-142</CliCommandLineParserVersion> <CliCommandLineParserVersion>0.1.0-alpha-142</CliCommandLineParserVersion>
<CliProjectJsonMigrationVersion>1.1.0-alpha-2127</CliProjectJsonMigrationVersion> <CliMigrateVersion>1.2.1-alpha-002130</CliMigrateVersion>
<CliMigrateCommandVersion>0.1.0-alpha-2127</CliMigrateCommandVersion>
<CliNuGetPackagingCoreTypesVersion>4.3.0-preview1-2500</CliNuGetPackagingCoreTypesVersion>
<CliNuGetProjectModelVersion>4.3.0-preview1-2500</CliNuGetProjectModelVersion>
</PropertyGroup> </PropertyGroup>

2
src/dotnet/commands/dotnet-migrate/DotnetNewRedirector.cs
View file

@ -10,7 +10,7 @@ namespace Microsoft.DotNet.Tools.Migrate
{ {
public class DotnetNewRedirector : ICanCreateDotnetCoreTemplate public class DotnetNewRedirector : ICanCreateDotnetCoreTemplate
{ {
public void CreateWithWithEphemeralHiveAndNoRestore( public void CreateWithEphemeralHiveAndNoRestore(
string templateName, string templateName,
string outputDirectory, string outputDirectory,
string workingDirectory) string workingDirectory)

4
src/dotnet/dotnet.csproj
View file

@ -36,8 +36,8 @@
<PackageReference Include="Microsoft.Build" Version="$(CLI_MSBuild_Version)" /> <PackageReference Include="Microsoft.Build" Version="$(CLI_MSBuild_Version)" />
<PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="$(PlatformAbstractionsVersion)" /> <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="$(PlatformAbstractionsVersion)" />
<PackageReference Include="Microsoft.DotNet.Cli.CommandLine" Version="$(CliCommandLineParserVersion)" /> <PackageReference Include="Microsoft.DotNet.Cli.CommandLine" Version="$(CliCommandLineParserVersion)" />
<PackageReference Include="Microsoft.DotNet.Tools.MigrateCommand" Version="$(CliMigrateCommandVersion)" /> <PackageReference Include="Microsoft.DotNet.Tools.MigrateCommand" Version="$(CliMigrateVersion)" />
<PackageReference Include="Microsoft.DotNet.ProjectJsonMigration" Version="$(CliProjectJsonMigrationVersion)" /> <PackageReference Include="Microsoft.DotNet.ProjectJsonMigration" Version="$(CliMigrateVersion)" />
<PackageReference Include="Microsoft.TemplateEngine.Abstractions" Version="$(TemplateEngineVersion)" /> <PackageReference Include="Microsoft.TemplateEngine.Abstractions" Version="$(TemplateEngineVersion)" />
<PackageReference Include="Microsoft.TemplateEngine.Cli" Version="$(TemplateEngineVersion)" /> <PackageReference Include="Microsoft.TemplateEngine.Cli" Version="$(TemplateEngineVersion)" />
<PackageReference Include="Microsoft.TemplateEngine.Orchestrator.RunnableProjects" Version="$(TemplateEngineVersion)" /> <PackageReference Include="Microsoft.TemplateEngine.Orchestrator.RunnableProjects" Version="$(TemplateEngineVersion)" />

4
src/redist/redist.csproj
View file

@ -21,8 +21,8 @@
<PackageReference Include="NuGet.Build.Tasks" Version="$(CLI_NuGet_Version)" /> <PackageReference Include="NuGet.Build.Tasks" Version="$(CLI_NuGet_Version)" />
<PackageReference Include="Microsoft.TestPlatform.CLI" Version="$(CLI_TestPlatform_Version)" /> <PackageReference Include="Microsoft.TestPlatform.CLI" Version="$(CLI_TestPlatform_Version)" />
<PackageReference Include="Microsoft.TestPlatform.Build" Version="$(CLI_TestPlatform_Version)" /> <PackageReference Include="Microsoft.TestPlatform.Build" Version="$(CLI_TestPlatform_Version)" />
<PackageReference Include="NuGet.Packaging.Core.Types" Version="$(CliNuGetPackagingCoreTypesVersion)" /> <PackageReference Include="NuGet.Packaging.Core.Types" Version="$(CLI_NuGet_Version)" />
<PackageReference Include="NuGet.ProjectModel" Version="$(CliNuGetProjectModelVersion)" /> <PackageReference Include="NuGet.ProjectModel" Version="$(CLI_NuGet_Version)" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
test/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj
View file

@ -21,6 +21,6 @@
<PackageReference Include="FluentAssertions" Version="4.18.0" /> <PackageReference Include="FluentAssertions" Version="4.18.0" />
<PackageReference Include="xunit" Version="2.2.0-beta4-build3444" /> <PackageReference Include="xunit" Version="2.2.0-beta4-build3444" />
<PackageReference Include="Microsoft.Build" Version="$(CLI_MSBuild_Version)" /> <PackageReference Include="Microsoft.Build" Version="$(CLI_MSBuild_Version)" />
<PackageReference Include="Microsoft.DotNet.ProjectJsonMigration" Version="$(CliProjectJsonMigrationVersion)" /> <PackageReference Include="Microsoft.DotNet.ProjectJsonMigration" Version="$(CliMigrateVersion)" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
test/dotnet-add-reference.Tests/dotnet-add-reference.Tests.csproj
View file

@ -21,6 +21,6 @@
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" /> <PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
<PackageReference Include="xunit" Version="2.2.0-beta4-build3444" /> <PackageReference Include="xunit" Version="2.2.0-beta4-build3444" />
<PackageReference Include="Microsoft.Build" Version="$(CLI_MSBuild_Version)" /> <PackageReference Include="Microsoft.Build" Version="$(CLI_MSBuild_Version)" />
<PackageReference Include="Microsoft.DotNet.ProjectJsonMigration" Version="$(CliProjectJsonMigrationVersion)" /> <PackageReference Include="Microsoft.DotNet.ProjectJsonMigration" Version="$(CliMigrateVersion)" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
test/dotnet-list-reference.Tests/dotnet-list-reference.Tests.csproj
View file

@ -19,6 +19,6 @@
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta4-build1194" /> <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta4-build1194" />
<PackageReference Include="xunit" Version="2.2.0-beta4-build3444" /> <PackageReference Include="xunit" Version="2.2.0-beta4-build3444" />
<PackageReference Include="FluentAssertions" Version="4.18.0" /> <PackageReference Include="FluentAssertions" Version="4.18.0" />
<PackageReference Include="Microsoft.DotNet.ProjectJsonMigration" Version="$(CliProjectJsonMigrationVersion)" /> <PackageReference Include="Microsoft.DotNet.ProjectJsonMigration" Version="$(CliMigrateVersion)" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
test/dotnet-migrate.Tests/dotnet-migrate.Tests.csproj
View file

@ -28,6 +28,6 @@
<PackageReference Include="xunit" Version="2.2.0-beta4-build3444" /> <PackageReference Include="xunit" Version="2.2.0-beta4-build3444" />
<PackageReference Include="FluentAssertions" Version="4.18.0" /> <PackageReference Include="FluentAssertions" Version="4.18.0" />
<PackageReference Include="moq.netcore" Version="4.4.0-beta8" /> <PackageReference Include="moq.netcore" Version="4.4.0-beta8" />
<PackageReference Include="Microsoft.DotNet.ProjectJsonMigration" Version="$(CliProjectJsonMigrationVersion)" /> <PackageReference Include="Microsoft.DotNet.ProjectJsonMigration" Version="$(CliMigrateVersion)" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
test/dotnet-remove-package.Tests/dotnet-remove-package.Tests.csproj
View file

@ -20,6 +20,6 @@
<PackageReference Include="xunit" Version="2.2.0-beta4-build3444" /> <PackageReference Include="xunit" Version="2.2.0-beta4-build3444" />
<PackageReference Include="Microsoft.Build" Version="$(CLI_MSBuild_Version)" /> <PackageReference Include="Microsoft.Build" Version="$(CLI_MSBuild_Version)" />
<PackageReference Include="FluentAssertions" Version="4.18.0" /> <PackageReference Include="FluentAssertions" Version="4.18.0" />
<PackageReference Include="Microsoft.DotNet.ProjectJsonMigration" Version="$(CliProjectJsonMigrationVersion)" /> <PackageReference Include="Microsoft.DotNet.ProjectJsonMigration" Version="$(CliMigrateVersion)" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
test/dotnet-remove-reference.Tests/dotnet-remove-reference.Tests.csproj
View file

@ -20,6 +20,6 @@
<PackageReference Include="xunit" Version="2.2.0-beta4-build3444" /> <PackageReference Include="xunit" Version="2.2.0-beta4-build3444" />
<PackageReference Include="Microsoft.Build" Version="$(CLI_MSBuild_Version)" /> <PackageReference Include="Microsoft.Build" Version="$(CLI_MSBuild_Version)" />
<PackageReference Include="FluentAssertions" Version="4.18.0" /> <PackageReference Include="FluentAssertions" Version="4.18.0" />
<PackageReference Include="Microsoft.DotNet.ProjectJsonMigration" Version="$(CliProjectJsonMigrationVersion)" /> <PackageReference Include="Microsoft.DotNet.ProjectJsonMigration" Version="$(CliMigrateVersion)" />
</ItemGroup> </ItemGroup>
</Project> </Project>