diff --git a/Directory.Build.props b/Directory.Build.props index c7003b9eea..10676de560 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -14,9 +14,6 @@ $(MSBuildThisFileDirectory) $(MSBuildThisFileDirectory)build\Key.snk true - Microsoft - MicrosoftNuGet - true true diff --git a/run.sh b/run.sh index 61f7a53385..4c1fed5646 100755 --- a/run.sh +++ b/run.sh @@ -220,7 +220,7 @@ if [ -f "$config_file" ]; then config_channel="$(jq -r 'select(.channel!=null) | .channel' "$config_file")" config_tools_source="$(jq -r 'select(.toolsSource!=null) | .toolsSource' "$config_file")" else - _error "$config_file contains invalid JSON." + __error "$config_file contains invalid JSON." exit 1 fi elif __machine_has python ; then @@ -228,7 +228,7 @@ if [ -f "$config_file" ]; then config_channel="$(python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['channel'] if 'channel' in obj else '')")" config_tools_source="$(python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['toolsSource'] if 'toolsSource' in obj else '')")" else - _error "$config_file contains invalid JSON." + __error "$config_file contains invalid JSON." exit 1 fi elif __machine_has python3 ; then @@ -236,11 +236,11 @@ if [ -f "$config_file" ]; then config_channel="$(python3 -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['channel'] if 'channel' in obj else '')")" config_tools_source="$(python3 -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['toolsSource'] if 'toolsSource' in obj else '')")" else - _error "$config_file contains invalid JSON." + __error "$config_file contains invalid JSON." exit 1 fi else - _error 'Missing required command: jq or python. Could not parse the JSON file.' + __error 'Missing required command: jq or python. Could not parse the JSON file.' exit 1 fi 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 b9453e0891..9574c695d3 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 @@ -22,11 +22,17 @@ + + + + + + + + + - - - - + diff --git a/test/FunctionalTests/CoreCLRTests/RazorPagesAppTest_CoreCLR.cs b/test/FunctionalTests/CoreCLRTests/RazorPagesAppTest_CoreCLR.cs index 281cf046b3..9c9a107cb8 100644 --- a/test/FunctionalTests/CoreCLRTests/RazorPagesAppTest_CoreCLR.cs +++ b/test/FunctionalTests/CoreCLRTests/RazorPagesAppTest_CoreCLR.cs @@ -22,7 +22,7 @@ namespace FunctionalTests public ApplicationTestFixture Fixture { get; } - [Fact] + [Fact(Skip = "https://github.com/aspnet/MvcPrecompilation/issues/287")] public async Task Precompilation_WorksForIndexPage_UsingFolderName() { using (StartLog(out var loggerFactory)) @@ -40,7 +40,7 @@ namespace FunctionalTests } } - [Fact] + [Fact(Skip = "https://github.com/aspnet/MvcPrecompilation/issues/287")] public async Task Precompilation_WorksForIndexPage_UsingFileName() { using (StartLog(out var loggerFactory)) @@ -58,7 +58,7 @@ namespace FunctionalTests } } - [Fact] + [Fact(Skip = "https://github.com/aspnet/MvcPrecompilation/issues/287")] public async Task Precompilation_WorksForPageWithModel() { using (StartLog(out var loggerFactory)) @@ -76,7 +76,7 @@ namespace FunctionalTests } } - [Fact] + [Fact(Skip = "https://github.com/aspnet/MvcPrecompilation/issues/287")] public async Task Precompilation_WorksForPageWithRoute() { using (StartLog(out var loggerFactory)) @@ -94,7 +94,7 @@ namespace FunctionalTests } } - [Fact] + [Fact(Skip = "https://github.com/aspnet/MvcPrecompilation/issues/287")] public async Task Precompilation_WorksForPageInNestedFolder() { using (StartLog(out var loggerFactory)) @@ -112,7 +112,7 @@ namespace FunctionalTests } } - [Fact] + [Fact(Skip = "https://github.com/aspnet/MvcPrecompilation/issues/287")] public async Task Precompilation_WorksWithPageConventions() { using (StartLog(out var loggerFactory)) diff --git a/test/FunctionalTests/FunctionalTests.csproj b/test/FunctionalTests/FunctionalTests.csproj index 5c8fa36506..a0c5f23b91 100644 --- a/test/FunctionalTests/FunctionalTests.csproj +++ b/test/FunctionalTests/FunctionalTests.csproj @@ -6,7 +6,6 @@ $(DefineConstants);__remove_this_to__GENERATE_BASELINES $(DefineConstants);GENERATE_BASELINES false - false false win7-x64 diff --git a/testapps/Directory.Build.props b/testapps/Directory.Build.props index 4d776f550d..c8b985bfca 100644 --- a/testapps/Directory.Build.props +++ b/testapps/Directory.Build.props @@ -19,6 +19,5 @@ 1.0.0 false - false diff --git a/testapps/StrongNamedApp/StrongNamedApp.csproj b/testapps/StrongNamedApp/StrongNamedApp.csproj index b2d66d2953..f76a4cc9f4 100644 --- a/testapps/StrongNamedApp/StrongNamedApp.csproj +++ b/testapps/StrongNamedApp/StrongNamedApp.csproj @@ -3,7 +3,6 @@ $(StandardTestAppTfms) true - true true