Skip to content
This repository was archived by the owner on Apr 20, 2023. It is now read-only.

Commit acd57a1

Browse files
authored
Merge pull request #7611 from mlorbetske/dev/mlorbe/UpdateToAspNet106and114
Update to ASP.NET 1.0.6 and 1.1.4
2 parents 9909fec + 145a9e7 commit acd57a1

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

NuGet.Config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<add key="roslyn" value="https://dotnet.myget.org/f/roslyn/api/v3/index.json" />
1010
<add key="xunit" value="https://www.myget.org/F/xunit/api/v3/index.json" />
1111
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
12-
<add key="AspNetCurrent" value="https://dotnet.myget.org/F/aspnet-feb2017-patch/api/v3/index.json" />
12+
<add key="AspNetCurrent" value="https://dotnet.myget.org/F/dotnet-2017-09-servicing/api/v3/index.json" />
1313
<add key="web-api" value="https://dotnet.myget.org/F/dotnet-web/api/v3/index.json" />
1414
<add key="symreader-native" value="https://dotnet.myget.org/F/symreader-native/api/v3/index.json" />
1515
</packageSources>

build/Microsoft.DotNet.Cli.DependencyVersions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<CLI_SharedFrameworkVersion>1.1.3</CLI_SharedFrameworkVersion>
55
<CLI_CoreCLRVersion>1.1.3</CLI_CoreCLRVersion>
6-
<CLI_JitVersion>>1.1.3</CLI_JitVersion>
6+
<CLI_JitVersion>1.1.3</CLI_JitVersion>
77
<CLI_SharedHostVersion>1.1.0</CLI_SharedHostVersion>
88
<CLI_HostFxrContainerVersion>1.1.0</CLI_HostFxrContainerVersion>
99
<CLI_HostFxrVersion Condition="'$(OS)' != 'Windows_NT'">1.1.0</CLI_HostFxrVersion>
@@ -23,7 +23,7 @@
2323
<CLI_WEBSDK_Version>1.0.0-alpha-20170516-2-509</CLI_WEBSDK_Version>
2424
<CLI_TestPlatform_Version>15.0.0</CLI_TestPlatform_Version>
2525
<TemplateEngineVersion>1.0.0-beta2-20170629-269</TemplateEngineVersion>
26-
<TemplateEngineTemplateVersion>1.0.0-beta2-20170629-269</TemplateEngineTemplateVersion>
26+
<TemplateEngineTemplateVersion>1.0.0-beta2-20170907-306</TemplateEngineTemplateVersion>
2727
<PlatformAbstractionsVersion>1.0.3</PlatformAbstractionsVersion>
2828
<DependencyModelVersion>1.0.3</DependencyModelVersion>
2929
</PropertyGroup>

test/dotnet-migrate.Tests/NuGet.tempaspnetpatch.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
<add key="aspnet101" value="https://www.myget.org/F/aspnet101/api/v3/index.json" />
99
<add key="dotnet-web" value="https://dotnet.myget.org/F/dotnet-web/api/v3/index.json" />
1010
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
11-
<add key="AspNetCurrent" value="https://dotnet.myget.org/F/aspnet-feb2017-patch/api/v3/index.json" />
11+
<add key="AspNetCurrent" value="https://dotnet.myget.org/F/dotnet-2017-09-servicing/api/v3/index.json" />
1212
</packageSources>
1313
</configuration>

test/dotnet-new.Tests/NuGet.tempaspnetpatch.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
<add key="aspnet101" value="https://www.myget.org/F/aspnet101/api/v3/index.json" />
88
<add key="dotnet-web" value="https://dotnet.myget.org/F/dotnet-web/api/v3/index.json" />
99
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
10-
<add key="AspNetCurrent" value="https://dotnet.myget.org/F/aspnet-feb2017-patch/api/v3/index.json" />
10+
<add key="AspNetCurrent" value="https://dotnet.myget.org/F/dotnet-2017-09-servicing/api/v3/index.json" />
1111
</packageSources>
1212
</configuration>

test/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) .NET Foundation and contributors. All rights reserved. 
1+
// Copyright (c) .NET Foundation and contributors. All rights reserved. 
22
// Licensed under the MIT license. See LICENSE file in the project root for full license information. 
33

44
using System;
@@ -355,7 +355,7 @@ public void ItRestoresTheNuGetPackagesToTheNuGetCacheFolder()
355355

356356
_nugetCacheFolder
357357
.GetDirectory("microsoft.aspnetcore.mvc")
358-
.Should().HaveDirectories(new string[] { "1.0.4", "1.1.3" });
358+
.Should().HaveDirectories(new string[] { "1.0.5", "1.1.4" });
359359
}
360360

361361
private string GetDotnetVersion()

0 commit comments

Comments
 (0)