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

Update templates and engine, pin ASP.NET package versions, add web item templates

Browse source
This commit is contained in:
Mike Lorbetske 2017-04-19 20:07:10 -07:00
parent 8f2fcef544
commit 9ea9cbc8a6
5 changed files with 22 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
build/BundledTemplates.props
View file

@ -1,6 +1,7 @@
<Project ToolsVersion="15.0"> <Project ToolsVersion="15.0">
<ItemGroup> <ItemGroup>
<BundledTemplate Include="Microsoft.DotNet.Common.ItemTemplates" Version="$(TemplateEngineTemplateVersion)" /> <BundledTemplate Include="Microsoft.DotNet.Common.ItemTemplates" Version="$(TemplateEngineTemplateVersion)" />
<BundledTemplate Include="Microsoft.DotNet.Web.ItemTemplates" Version="$(TemplateEngineTemplateVersion)" />
<BundledTemplate Include="Microsoft.DotNet.Common.ProjectTemplates.2.0" Version="$(TemplateEngineTemplate2_0Version)" /> <BundledTemplate Include="Microsoft.DotNet.Common.ProjectTemplates.2.0" Version="$(TemplateEngineTemplate2_0Version)" />
<BundledTemplate Include="Microsoft.DotNet.Test.ProjectTemplates.2.0" Version="$(TemplateEngineTemplateVersion)" /> <BundledTemplate Include="Microsoft.DotNet.Test.ProjectTemplates.2.0" Version="$(TemplateEngineTemplateVersion)" />
<BundledTemplate Include="Microsoft.DotNet.Web.ProjectTemplates.2.0" Version="$(TemplateEngineTemplateVersion)" /> <BundledTemplate Include="Microsoft.DotNet.Web.ProjectTemplates.2.0" Version="$(TemplateEngineTemplateVersion)" />

6
build/DependencyVersions.props
View file

@ -11,9 +11,9 @@
<SharedFrameworkVersion>$(CLI_SharedFrameworkVersion)</SharedFrameworkVersion> <SharedFrameworkVersion>$(CLI_SharedFrameworkVersion)</SharedFrameworkVersion>
<SharedHostVersion>$(CLI_SharedFrameworkVersion)</SharedHostVersion> <SharedHostVersion>$(CLI_SharedFrameworkVersion)</SharedHostVersion>
<HostFxrVersion>$(CLI_SharedFrameworkVersion)</HostFxrVersion> <HostFxrVersion>$(CLI_SharedFrameworkVersion)</HostFxrVersion>
<TemplateEngineVersion>1.0.0-beta2-20170410-189</TemplateEngineVersion> <TemplateEngineVersion>1.0.0-beta2-20170419-195</TemplateEngineVersion>
<TemplateEngineTemplateVersion>1.0.0-beta2-20170410-189</TemplateEngineTemplateVersion> <TemplateEngineTemplateVersion>1.0.0-beta2-20170419-195</TemplateEngineTemplateVersion>
<TemplateEngineTemplate2_0Version>1.0.0-beta2-20170410-189</TemplateEngineTemplate2_0Version> <TemplateEngineTemplate2_0Version>1.0.0-beta2-20170419-195</TemplateEngineTemplate2_0Version>
<PlatformAbstractionsVersion>2.0.0-preview1-001960</PlatformAbstractionsVersion> <PlatformAbstractionsVersion>2.0.0-preview1-001960</PlatformAbstractionsVersion>
<DependencyModelVersion>2.0.0-preview1-002022</DependencyModelVersion> <DependencyModelVersion>2.0.0-preview1-002022</DependencyModelVersion>
<CliCommandLineParserVersion>0.1.0-alpha-142</CliCommandLineParserVersion> <CliCommandLineParserVersion>0.1.0-alpha-142</CliCommandLineParserVersion>

13
build/compile/LzmaArchive.targets
View file

@ -79,6 +79,7 @@
<FilesToClean Include="$(NuGetPackagesArchiveFolder)/**/*" /> <FilesToClean Include="$(NuGetPackagesArchiveFolder)/**/*" />
<NuGetPackagesArchiveDirectory Include="$(NuGetPackagesArchiveProject)/Console" /> <NuGetPackagesArchiveDirectory Include="$(NuGetPackagesArchiveProject)/Console" />
<NuGetPackagesArchiveDirectory Include="$(NuGetPackagesArchiveProject)/MvcIndividual" />
<NuGetPackagesArchiveDirectory Include="$(NuGetPackagesArchiveFolder)" /> <NuGetPackagesArchiveDirectory Include="$(NuGetPackagesArchiveFolder)" />
</ItemGroup> </ItemGroup>
@ -101,6 +102,18 @@
SkipInvalidConfigurations="True" SkipInvalidConfigurations="True"
WorkingDirectory="$(NuGetPackagesArchiveProject)/Console" /> WorkingDirectory="$(NuGetPackagesArchiveProject)/Console" />
<DotNetNew ToolPath="$(OutputDirectory)"
TemplateType="mvc"
TemplateArgs="-au Individual --debug:ephemeral-hive --no-restore"
WorkingDirectory="$(NuGetPackagesArchiveProject)/MvcIndividual" />
<DotNetRestore ToolPath="$(OutputDirectory)"
Packages="$(NuGetPackagesArchiveFolder)"
ConfigFile="$(LZMANuGetConfigFilePath)"
SkipInvalidConfigurations="True"
WorkingDirectory="$(NuGetPackagesArchiveProject)/MvcIndividual" />
<Delete Files="$(IntermediateArchive);$(IntermediateArchive).zip;$(NuGetPackagesArchiveFolder)/**/*.nupkg" /> <Delete Files="$(IntermediateArchive);$(IntermediateArchive).zip;$(NuGetPackagesArchiveFolder)/**/*.nupkg" />
<Message Text="Publishing Archiver" /> <Message Text="Publishing Archiver" />

1
build_projects/dotnet-cli-build/GenerateNuGetPackagesArchiveVersion.cs
View file

@ -30,6 +30,7 @@ namespace Microsoft.DotNet.Cli.Build
private static string[][] _templatesAndArgs = new string[][] private static string[][] _templatesAndArgs = new string[][]
{ {
new string[] { "console", "" }, new string[] { "console", "" },
new string[] { "mvc", "-au individual" },
}; };
public override bool Execute() public override bool Execute()

9
test/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs
View file

@ -97,11 +97,6 @@ A command is running to initially populate your local package cache, to improve
"microsoft.netcore.app", "microsoft.netcore.app",
"microsoft.netcore.platforms", "microsoft.netcore.platforms",
"netstandard.library", "netstandard.library",
};
// https://github.com/dotnet/cli/issues/5505 - add the "2.0" asp.net packages into the offline cache
List<string> unexpectedDirectories = new List<string>()
{
"microsoft.aspnetcore.diagnostics", "microsoft.aspnetcore.diagnostics",
"microsoft.aspnetcore.mvc", "microsoft.aspnetcore.mvc",
"microsoft.aspnetcore.routing", "microsoft.aspnetcore.routing",
@ -117,6 +112,10 @@ A command is running to initially populate your local package cache, to improve
"microsoft.visualstudio.web.browserlink", "microsoft.visualstudio.web.browserlink",
}; };
List<string> unexpectedDirectories = new List<string>()
{
};
_nugetFallbackFolder _nugetFallbackFolder
.Should() .Should()
.HaveDirectories(expectedDirectories); .HaveDirectories(expectedDirectories);