huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

automated: merge branch release/2.2

This commit is contained in:
Nate McMaster 2018-09-28 17:27:34 -07:00
parent 62ace2e217 794567b946
commit 3cd4de8af8
No known key found for this signature in database
GPG Key ID: A778D9601BD78810
7 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Directory.Build.props
View File

@ -14,9 +14,6 @@
<RepositoryRoot>$(MSBuildThisFileDirectory)</RepositoryRoot> <RepositoryRoot>$(MSBuildThisFileDirectory)</RepositoryRoot>
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)build\Key.snk</AssemblyOriginatorKeyFile> <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)build\Key.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly> <SignAssembly>true</SignAssembly>
<AssemblySigningCertName>Microsoft</AssemblySigningCertName>
<PackageSigningCertName>MicrosoftNuGet</PackageSigningCertName>
<PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors> <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

8
run.sh
View File

@ -220,7 +220,7 @@ if [ -f "$config_file" ]; then
config_channel="$(jq -r 'select(.channel!=null) | .channel' "$config_file")" config_channel="$(jq -r 'select(.channel!=null) | .channel' "$config_file")"
config_tools_source="$(jq -r 'select(.toolsSource!=null) | .toolsSource' "$config_file")" config_tools_source="$(jq -r 'select(.toolsSource!=null) | .toolsSource' "$config_file")"
else else
_error "$config_file contains invalid JSON." __error "$config_file contains invalid JSON."
exit 1 exit 1
fi fi
elif __machine_has python ; then 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_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 '')")" 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 else
_error "$config_file contains invalid JSON." __error "$config_file contains invalid JSON."
exit 1 exit 1
fi fi
elif __machine_has python3 ; then 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_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 '')")" 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 else
_error "$config_file contains invalid JSON." __error "$config_file contains invalid JSON."
exit 1 exit 1
fi fi
else 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 exit 1
fi fi

14
src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.csproj
View File

@ -22,11 +22,17 @@
<PackageReference Update="Microsoft.NETCore.App" PrivateAssets="All" /> <PackageReference Update="Microsoft.NETCore.App" PrivateAssets="All" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
<SignedPackageFile Include="$(TargetPath)" PackagePath="build/netstandard2.0/netcoreapp2.0/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.dll" Certificate="$(AssemblySigningCertName)" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net461'">
<SignedPackageFile Include="$(TargetDir)\$(AssemblyName)-x86.exe" PackagePath="build/netstandard2.0/net461/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation-x86.exe" Certificate="$(AssemblySigningCertName)" />
<SignedPackageFile Include="$(TargetDir)\$(AssemblyName).exe" PackagePath="build/netstandard2.0/net461/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.exe" Certificate="$(AssemblySigningCertName)" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == ''"> <ItemGroup Condition="'$(TargetFramework)' == ''">
<SignedPackageFile Include="build/netstandard2.0/netcoreapp2.0/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.dll" Certificate="$(AssemblySigningCertName)" /> <SignedPackageFile Include="$(TasksProjectDirectory)bin\$(Configuration)\netstandard2.0\$(AssemblyName).Tasks.dll;" PackagePath="build/netstandard2.0/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tasks.dll" Certificate="$(AssemblySigningCertName)" />
<SignedPackageFile Include="build/netstandard2.0/net461/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation-x86.exe" Certificate="$(AssemblySigningCertName)" />
<SignedPackageFile Include="build/netstandard2.0/net461/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.exe" Certificate="$(AssemblySigningCertName)" />
<SignedPackageFile Include="build/netstandard2.0/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tasks.dll" Certificate="$(AssemblySigningCertName)" />
</ItemGroup> </ItemGroup>
<Target Name="BuildX86" AfterTargets="Build" Condition="'$(TargetFramework)'=='net461' AND '$(PlatformTarget)'!='x86'"> <Target Name="BuildX86" AfterTargets="Build" Condition="'$(TargetFramework)'=='net461' AND '$(PlatformTarget)'!='x86'">

12
test/FunctionalTests/CoreCLRTests/RazorPagesAppTest_CoreCLR.cs
View File

@ -22,7 +22,7 @@ namespace FunctionalTests
public ApplicationTestFixture Fixture { get; } public ApplicationTestFixture Fixture { get; }
[Fact] [Fact(Skip = "https://github.com/aspnet/MvcPrecompilation/issues/287")]
public async Task Precompilation_WorksForIndexPage_UsingFolderName() public async Task Precompilation_WorksForIndexPage_UsingFolderName()
{ {
using (StartLog(out var loggerFactory)) 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() public async Task Precompilation_WorksForIndexPage_UsingFileName()
{ {
using (StartLog(out var loggerFactory)) 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() public async Task Precompilation_WorksForPageWithModel()
{ {
using (StartLog(out var loggerFactory)) 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() public async Task Precompilation_WorksForPageWithRoute()
{ {
using (StartLog(out var loggerFactory)) 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() public async Task Precompilation_WorksForPageInNestedFolder()
{ {
using (StartLog(out var loggerFactory)) 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() public async Task Precompilation_WorksWithPageConventions()
{ {
using (StartLog(out var loggerFactory)) using (StartLog(out var loggerFactory))

1
test/FunctionalTests/FunctionalTests.csproj
View File

@ -6,7 +6,6 @@
<DefineConstants>$(DefineConstants);__remove_this_to__GENERATE_BASELINES</DefineConstants> <DefineConstants>$(DefineConstants);__remove_this_to__GENERATE_BASELINES</DefineConstants>
<DefineConstants Condition="'$(GenerateBaseLines)'=='true'">$(DefineConstants);GENERATE_BASELINES</DefineConstants> <DefineConstants Condition="'$(GenerateBaseLines)'=='true'">$(DefineConstants);GENERATE_BASELINES</DefineConstants>
<SignAssembly>false</SignAssembly> <SignAssembly>false</SignAssembly>
<PublicSign>false</PublicSign>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems> <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net461'">win7-x64</RuntimeIdentifier> <RuntimeIdentifier Condition="'$(TargetFramework)' == 'net461'">win7-x64</RuntimeIdentifier>

1
testapps/Directory.Build.props
View File

@ -19,6 +19,5 @@
<!-- Override some repo-level properties not required for tests. --> <!-- Override some repo-level properties not required for tests. -->
<Version>1.0.0</Version> <Version>1.0.0</Version>
<SignAssembly>false</SignAssembly> <SignAssembly>false</SignAssembly>
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">false</PublicSign>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

1
testapps/StrongNamedApp/StrongNamedApp.csproj
View File

@ -3,7 +3,6 @@
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>$(StandardTestAppTfms)</TargetFrameworks> <TargetFrameworks>$(StandardTestAppTfms)</TargetFrameworks>
<SignAssembly>true</SignAssembly> <SignAssembly>true</SignAssembly>
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
<MvcRazorCompileOnPublish>true</MvcRazorCompileOnPublish> <MvcRazorCompileOnPublish>true</MvcRazorCompileOnPublish>
</PropertyGroup> </PropertyGroup>