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

Merge pull request #5433 from mlorbetske/rel/1.0.0-rc3

Browse source 
Update version of Microsoft.AspNetCore.Mvc
This commit is contained in:
Piotr Puszkiewicz 2017-01-24 03:08:13 -08:00 • committed by GitHub
commit 0de3338607
7 changed files with 22 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build/Microsoft.DotNet.Cli.DependencyVersions.props
View file

@ -6,6 +6,6 @@
<CLI_NETSDK_Version>1.0.0-alpha-20170123-1</CLI_NETSDK_Version> <CLI_NETSDK_Version>1.0.0-alpha-20170123-1</CLI_NETSDK_Version>
<CLI_WEBSDK_Version>1.0.0-alpha-20170114-1-223</CLI_WEBSDK_Version> <CLI_WEBSDK_Version>1.0.0-alpha-20170114-1-223</CLI_WEBSDK_Version>
<CLI_TestPlatform_Version>15.0.0-preview-20170106-08</CLI_TestPlatform_Version> <CLI_TestPlatform_Version>15.0.0-preview-20170106-08</CLI_TestPlatform_Version>
<TemplateEngineVersion>1.0.0-beta1-20170108-83</TemplateEngineVersion> <TemplateEngineVersion>1.0.0-beta1-20170123-94</TemplateEngineVersion>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

15
build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets
View file

@ -67,10 +67,25 @@
<NuGetPackagesArchiveDirectory Include="$(NuGetPackagesArchiveFolder)" /> <NuGetPackagesArchiveDirectory Include="$(NuGetPackagesArchiveFolder)" />
</ItemGroup> </ItemGroup>
<PropertyGroup>
<NuGetConfigContent>
&lt;configuration&gt;
&lt;packageSources&gt;
&lt;add key="configurable.source" value="%CLI_LZMA_PACKAGE_SOURCE%" /&gt;
&lt;/packageSources&gt;
&lt;/configuration&gt;
</NuGetConfigContent>
<LZMANuGetConfigFilePath>$(NuGetPackagesArchiveProject)/Nuget.config</LZMANuGetConfigFilePath>
</PropertyGroup>
<Delete Files="@(FilesToClean)" /> <Delete Files="@(FilesToClean)" />
<RemoveDir Directories="@(NuGetPackagesArchiveDirectory)" /> <RemoveDir Directories="@(NuGetPackagesArchiveDirectory)" />
<MakeDir Directories="@(NuGetPackagesArchiveDirectory)"/> <MakeDir Directories="@(NuGetPackagesArchiveDirectory)"/>
<WriteLinesToFile Condition=" 'CLI_LZMA_PACKAGE_SOURCE' != '' "
File="$(LZMANuGetConfigFilePath)"
Lines="$(NuGetConfigContent)" />
<DotNetNew ToolPath="$(Stage2Directory)" <DotNetNew ToolPath="$(Stage2Directory)"
TemplateType="Web" TemplateType="Web"
WorkingDirectory="$(NuGetPackagesArchiveProject)/Web" /> WorkingDirectory="$(NuGetPackagesArchiveProject)/Web" />

2
src/dotnet/commands/dotnet-new/CSharp_Web/$projectName$.csproj
View file

@ -9,6 +9,6 @@
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.0.2" /> <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.0.2" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.0.1" /> <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.0.1" /> <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.0.1" />
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="1.0.0" /> <PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="1.0.1" />
</ItemGroup> </ItemGroup>
</Project> </Project>

4
src/dotnet/commands/dotnet-new/CSharp_Web1.1/$projectName$.csproj
View file

@ -6,9 +6,9 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.AspNetCore" Version="1.1.0" /> <PackageReference Include="Microsoft.AspNetCore" Version="1.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.0" /> <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.1" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.0" /> <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.0" /> <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.0" />
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="1.0.0" /> <PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="1.1.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
src/dotnet/commands/dotnet-new/FSharp_Web/$projectName$.fsproj
View file

@ -20,7 +20,7 @@
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.0.1" /> <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.0.1" /> <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.0.1" />
<PackageReference Include="Microsoft.FSharp.Core.netcore" Version="1.0.0-alpha-161023" /> <PackageReference Include="Microsoft.FSharp.Core.netcore" Version="1.0.0-alpha-161023" />
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="1.0.0" /> <PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="1.0.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

4
test/dotnet-new.Tests/New3/GivenThatIWantANewAppWithSpecifiedType.cs
View file

@ -41,10 +41,6 @@ namespace Microsoft.DotNet.New3.Tests
File.Copy("NuGet.tempaspnetpatch.config", Path.Combine(rootPath, "NuGet.Config")); File.Copy("NuGet.tempaspnetpatch.config", Path.Combine(rootPath, "NuGet.Config"));
} }
string globalJsonPath = Path.Combine(rootPath, "global.json");
Assert.True(File.Exists(globalJsonPath));
Assert.Contains(Product.Version, File.ReadAllText(globalJsonPath));
new TestCommand("dotnet") new TestCommand("dotnet")
.WithWorkingDirectory(rootPath) .WithWorkingDirectory(rootPath)
.Execute($"restore") .Execute($"restore")

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

@ -82,7 +82,7 @@ A command is running to initially populate your local package cache, to improve
{ {
_nugetCacheFolder _nugetCacheFolder
.Should() .Should()
.HaveFile($"{GetDotnetVersion()}.dotnetSentinel"); .HaveFile($"{GetDotnetVersion()}.dotnetSentinel");
} }
[Fact] [Fact]
@ -116,7 +116,7 @@ A command is running to initially populate your local package cache, to improve
_nugetCacheFolder _nugetCacheFolder
.GetDirectory("microsoft.aspnetcore.mvc") .GetDirectory("microsoft.aspnetcore.mvc")
.Should().HaveDirectories(new string[] { "1.0.2", "1.1.0" }); .Should().HaveDirectories(new string[] { "1.0.2", "1.1.1" });
} }
private string GetDotnetVersion() private string GetDotnetVersion()