diff --git a/build.ps1 b/build.ps1 index 2acf6cd799..0605b59c01 100644 --- a/build.ps1 +++ b/build.ps1 @@ -33,7 +33,7 @@ cd $PSScriptRoot $repoFolder = $PSScriptRoot $env:REPO_FOLDER = $repoFolder -$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/rel/1.0.0-msbuild-rtm.zip" +$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/feature/msbuild.zip" if ($env:KOREBUILD_ZIP) { $koreBuildZip=$env:KOREBUILD_ZIP @@ -64,5 +64,4 @@ if (!(Test-Path $buildFolder)) { } } -&".build\dotnet\dotnet-install.ps1" -Channel 'master' -SharedRuntime -Version '1.2.0-beta-001304-00' -Architecture x64 &"$buildFile" $args \ No newline at end of file diff --git a/build.sh b/build.sh index 3bc0d49e7e..cdf9ea2514 100755 --- a/build.sh +++ b/build.sh @@ -2,7 +2,7 @@ repoFolder="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" cd $repoFolder -koreBuildZip="https://github.com/aspnet/KoreBuild/archive/rel/1.0.0-msbuild-rtm.zip" +koreBuildZip="https://github.com/aspnet/KoreBuild/archive/feature/msbuild.zip" if [ ! -z $KOREBUILD_ZIP ]; then koreBuildZip=$KOREBUILD_ZIP fi @@ -44,5 +44,4 @@ if test ! -d $buildFolder; then fi chmod +x .build/dotnet/dotnet-install.sh -.build/dotnet/dotnet-install.sh --shared-runtime --channel master --version 1.2.0-beta-001304-00 $buildFile -r $repoFolder "$@" \ No newline at end of file diff --git a/build/common-testapps.props b/build/common-testapps.props new file mode 100644 index 0000000000..931589cb1f --- /dev/null +++ b/build/common-testapps.props @@ -0,0 +1,11 @@ + + + 1.2.0-* + 1.6.2-* + + + + + + + \ No newline at end of file diff --git a/build/common.props b/build/common.props index a56db90e38..6a80ef7717 100644 --- a/build/common.props +++ b/build/common.props @@ -1,6 +1,5 @@ - Microsoft ASP.NET Core @@ -9,17 +8,12 @@ $(MSBuildThisFileDirectory)../build/Key.snk true true - © Microsoft Corporation. All rights reserved. - en-US + 1.2.0-* + 1.6.2-* - - - - - - + \ No newline at end of file diff --git a/global.json b/global.json deleted file mode 100644 index 005c9ae15e..0000000000 --- a/global.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "sdk": { - "version": "1.0.0-preview4-004233" - } -} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.csproj b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.csproj index d5d4740ae6..064e93cd46 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.csproj +++ b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.csproj @@ -1,5 +1,5 @@ - + Build-time references required to enable Razor view compilation as part of building the application. netcoreapp1.1;net451 @@ -10,20 +10,20 @@ build + build - - + + + + - - - - - - + + + \ No newline at end of file diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests/ApplicationConsumingPrecompiledViews.cs b/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests/ApplicationConsumingPrecompiledViews.cs index 2c022c5a6d..ec882b50f8 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests/ApplicationConsumingPrecompiledViews.cs +++ b/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests/ApplicationConsumingPrecompiledViews.cs @@ -7,6 +7,7 @@ using System.IO; using System.Linq; using System.Runtime.InteropServices; using System.Threading.Tasks; +using System.Xml.Linq; using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Testing.xunit; using Microsoft.DotNet.Cli.Utils; @@ -64,7 +65,17 @@ namespace Microsoft.AspNetCore.Mvc.Razor.ViewCompilation protected override void Restore() { CreateClassLibraryPackage(); - RestoreProject(ApplicationPath, new[] { _packOutputDirectory, "https://api.nuget.org/v3/index.json" }); + var nuGetConfigPath = Path.Combine(ApplicationPaths.SolutionDirectory, "NuGet.config"); + var nugetConfig = XDocument.Parse(File.ReadAllText(nuGetConfigPath)); + var sources = nugetConfig + .Root + .Element("packageSources") + .Elements("add") + .Select(s => s.Attribute("value").Value) + .ToList(); + sources.Add(_packOutputDirectory); + + RestoreProject(ApplicationPath, sources); } private void CreateClassLibraryPackage() diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests/Infrastructure/ApplicationTestFixture.cs b/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests/Infrastructure/ApplicationTestFixture.cs index c1d27d43e5..db2e8fe806 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests/Infrastructure/ApplicationTestFixture.cs +++ b/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests/Infrastructure/ApplicationTestFixture.cs @@ -110,7 +110,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.ViewCompilation } } - protected void RestoreProject(string applicationDirectory, string[] additionalFeeds = null) + protected void RestoreProject(string applicationDirectory, IList feeds = null) { var args = new List { @@ -118,9 +118,9 @@ namespace Microsoft.AspNetCore.Mvc.Razor.ViewCompilation TempRestoreDirectory, }; - if (additionalFeeds != null) + if (feeds != null) { - foreach (var feed in additionalFeeds) + foreach (var feed in feeds) { args.Add("-s"); args.Add(feed); diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests.csproj b/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests.csproj index 5c3fc9f160..2508c5b200 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests.csproj +++ b/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests.csproj @@ -1,5 +1,5 @@  - + netcoreapp1.1 $(DefineConstants);__remove_this_to__GENERATE_BASELINES @@ -10,14 +10,13 @@ - - - - + + + + - - + + - \ No newline at end of file diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test.csproj b/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test.csproj index 39e0f7835a..9a7b62e90c 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test.csproj +++ b/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test.csproj @@ -1,5 +1,5 @@  - + netcoreapp1.1 @@ -9,9 +9,8 @@ - - - - + + + diff --git a/testapps/ApplicationUsingPrecompiledViewClassLibrary/ApplicationUsingPrecompiledViewClassLibrary.csproj b/testapps/ApplicationUsingPrecompiledViewClassLibrary/ApplicationUsingPrecompiledViewClassLibrary.csproj index 76b9bb0338..863b57c25f 100644 --- a/testapps/ApplicationUsingPrecompiledViewClassLibrary/ApplicationUsingPrecompiledViewClassLibrary.csproj +++ b/testapps/ApplicationUsingPrecompiledViewClassLibrary/ApplicationUsingPrecompiledViewClassLibrary.csproj @@ -1,5 +1,5 @@ - + netcoreapp1.1;net451 true @@ -10,13 +10,9 @@ - - - - - - - - + + + + diff --git a/testapps/ApplicationUsingRelativePaths/ApplicationUsingRelativePaths.csproj b/testapps/ApplicationUsingRelativePaths/ApplicationUsingRelativePaths.csproj index 00372f0185..454e40c102 100644 --- a/testapps/ApplicationUsingRelativePaths/ApplicationUsingRelativePaths.csproj +++ b/testapps/ApplicationUsingRelativePaths/ApplicationUsingRelativePaths.csproj @@ -1,4 +1,5 @@ + netcoreapp1.1;net451 true @@ -9,16 +10,12 @@ - 1.1.0-* + 1.2.0-* All - - - - - - - - + + + + diff --git a/testapps/ApplicationWithConfigureMvc/ApplicationWithConfigureMvc.csproj b/testapps/ApplicationWithConfigureMvc/ApplicationWithConfigureMvc.csproj index cf50cd50e2..2cab61cdc1 100644 --- a/testapps/ApplicationWithConfigureMvc/ApplicationWithConfigureMvc.csproj +++ b/testapps/ApplicationWithConfigureMvc/ApplicationWithConfigureMvc.csproj @@ -1,5 +1,5 @@ - + netcoreapp1.1;net451 true @@ -10,16 +10,12 @@ - 1.1.0-* + 1.2.0-* All - - - - - - - - + + + + diff --git a/testapps/ApplicationWithCustomInputFiles/ApplicationWithCustomInputFiles.csproj b/testapps/ApplicationWithCustomInputFiles/ApplicationWithCustomInputFiles.csproj index 5d2763adc9..46550d1a67 100644 --- a/testapps/ApplicationWithCustomInputFiles/ApplicationWithCustomInputFiles.csproj +++ b/testapps/ApplicationWithCustomInputFiles/ApplicationWithCustomInputFiles.csproj @@ -1,4 +1,5 @@  + netcoreapp1.1;net451 true @@ -12,15 +13,12 @@ - 1.1.0-* + 1.2.0-* All - - - - - - - + + + + diff --git a/testapps/ApplicationWithTagHelpers/ApplicationWithTagHelpers.csproj b/testapps/ApplicationWithTagHelpers/ApplicationWithTagHelpers.csproj index 831009ac40..276611489e 100644 --- a/testapps/ApplicationWithTagHelpers/ApplicationWithTagHelpers.csproj +++ b/testapps/ApplicationWithTagHelpers/ApplicationWithTagHelpers.csproj @@ -1,5 +1,5 @@ - + netcoreapp1.1;net451 win7-x64 @@ -14,18 +14,14 @@ - + - 1.1.0-* + 1.2.0-* All - - - + + + - - - - diff --git a/testapps/ClassLibraryTagHelper/ClassLibraryTagHelper.csproj b/testapps/ClassLibraryTagHelper/ClassLibraryTagHelper.csproj index c49d7ee9e6..2bea09ffdd 100644 --- a/testapps/ClassLibraryTagHelper/ClassLibraryTagHelper.csproj +++ b/testapps/ClassLibraryTagHelper/ClassLibraryTagHelper.csproj @@ -1,13 +1,10 @@  + netstandard1.6;net451 - - - - - + \ No newline at end of file diff --git a/testapps/ClassLibraryWithPrecompiledViews/ClassLibraryWithPrecompiledViews.csproj b/testapps/ClassLibraryWithPrecompiledViews/ClassLibraryWithPrecompiledViews.csproj index 4ee98030b9..dfb4ea8ec9 100644 --- a/testapps/ClassLibraryWithPrecompiledViews/ClassLibraryWithPrecompiledViews.csproj +++ b/testapps/ClassLibraryWithPrecompiledViews/ClassLibraryWithPrecompiledViews.csproj @@ -1,5 +1,5 @@ - + 1.0.0-z$([System.DateTime]::UtcNow.Ticks) netcoreapp1.1;net451 @@ -17,17 +17,13 @@ - + - 1.1.0-* + 1.2.0-* All - - - - - + netcoreapp1.1;net451 true @@ -10,17 +10,13 @@ - + - 1.1.0-* + 1.2.0-* All - - - - - - - + + + diff --git a/testapps/SimpleApp/SimpleApp.csproj b/testapps/SimpleApp/SimpleApp.csproj index 365349be1a..0a9b71d550 100644 --- a/testapps/SimpleApp/SimpleApp.csproj +++ b/testapps/SimpleApp/SimpleApp.csproj @@ -1,4 +1,5 @@  + netcoreapp1.1;net451 true @@ -8,15 +9,12 @@ - 1.1.0-* + 1.2.0-* All - - - - - - - + + + + diff --git a/testapps/SimpleAppDesktopOnly/SimpleAppDesktopOnly.csproj b/testapps/SimpleAppDesktopOnly/SimpleAppDesktopOnly.csproj index ff561a4be7..5566911bb4 100644 --- a/testapps/SimpleAppDesktopOnly/SimpleAppDesktopOnly.csproj +++ b/testapps/SimpleAppDesktopOnly/SimpleAppDesktopOnly.csproj @@ -1,5 +1,5 @@ - + net451 win7-x64 @@ -9,13 +9,13 @@ - + - 1.1.0-* + 1.2.0-* All - - - + + + diff --git a/testapps/StrongNamedApp/StrongNamedApp.csproj b/testapps/StrongNamedApp/StrongNamedApp.csproj index 0f10baa02e..44f8c91969 100644 --- a/testapps/StrongNamedApp/StrongNamedApp.csproj +++ b/testapps/StrongNamedApp/StrongNamedApp.csproj @@ -1,5 +1,5 @@ - + netcoreapp1.1;net451 true @@ -12,16 +12,12 @@ - + - 1.1.0-* + 1.2.0-* - - - - - - - + + + diff --git a/version.props b/version.props index a1285c53c6..54c9611b1f 100644 --- a/version.props +++ b/version.props @@ -1,8 +1,7 @@ - 1.1.0-rtm - $(Version)-$(BuildNumber) - 1.1.0 + 1.2.0 + alpha \ No newline at end of file