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

Move to 3.0 Preview 6 SDK (#11472) 

* Work around https://github.com/dotnet/cli/issues/11378
* Fix site extensions - thanks @JunTaoLuo❕
This commit is contained in:
Doug Bunting 2019-06-25 20:43:07 -07:00 committed by GitHub
parent fe796b216e
commit e8fba43b1f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
eng/Workarounds.targets
View File

@ -31,7 +31,6 @@
<WarnOnPackingNonPackableProject>false</WarnOnPackingNonPackableProject> <WarnOnPackingNonPackableProject>false</WarnOnPackingNonPackableProject>
</PropertyGroup> </PropertyGroup>
<!-- Workaround for https://github.com/dotnet/arcade/issues/204 --> <!-- Workaround for https://github.com/dotnet/arcade/issues/204 -->
<ItemGroup> <ItemGroup>
<PackageReference Include="Internal.AspNetCore.BuildTasks" PrivateAssets="All" Version="$(InternalAspNetCoreBuildTasksPackageVersion)" IsImplicitlyDefined="true" /> <PackageReference Include="Internal.AspNetCore.BuildTasks" PrivateAssets="All" Version="$(InternalAspNetCoreBuildTasksPackageVersion)" IsImplicitlyDefined="true" />
@ -58,4 +57,10 @@
</KnownFrameworkReference> </KnownFrameworkReference>
</ItemGroup> </ItemGroup>
<!-- Work around https://github.com/dotnet/cli/issues/11378. -->
<Target Name="_WorkaroundNetStandard" AfterTargets="ResolvePackageAssets">
<ItemGroup>
<TransitiveFrameworkReference Remove="NETStandard.Library" />
</ItemGroup>
</Target>
</Project> </Project>

4
eng/targets/ReferenceAssembly.targets
View File

@ -76,10 +76,6 @@
</ItemGroup> </ItemGroup>
<PropertyGroup> <PropertyGroup>
<ProjectListFile>$(MSBuildThisFileDirectory)..\eng\ProjectReferences.props</ProjectListFile>
<RefsTargetFramework>$(TargetFrameworks)</RefsTargetFramework>
<RefsTargetFramework Condition="'$(RefsTargetFramework)' == ''">$(TargetFramework)</RefsTargetFramework>
<ReferencesContent> <ReferencesContent>
<![CDATA[ <![CDATA[
<ItemGroup Condition="'%24(TargetFramework)' == '$(TargetFramework)'"> <ItemGroup Condition="'%24(TargetFramework)' == '$(TargetFramework)'">

4
global.json
View File

@ -1,9 +1,9 @@
{ {
"sdk": { "sdk": {
"version": "3.0.100-preview5-011568" "version": "3.0.100-preview6-012264"
}, },
"tools": { "tools": {
"dotnet": "3.0.100-preview5-011568", "dotnet": "3.0.100-preview6-012264",
"runtimes": { "runtimes": {
"dotnet/x64": [ "dotnet/x64": [
"$(MicrosoftNETCoreAppRuntimeVersion)" "$(MicrosoftNETCoreAppRuntimeVersion)"

7
src/SiteExtensions/build.cmd
View File

@ -10,8 +10,9 @@ IF %ERRORLEVEL% NEQ 0 (
) )
ECHO Building LoggingBranch ECHO Building LoggingBranch
CALL %RepoRoot%\build.cmd -forceCoreMsbuild -arch x64 -projects %~dp0LoggingBranch\LB.csproj /bl:artifacts/log/SiteExtensions-LoggingBranch-x64.binlog %* REM Remove /p:DisablePackageAssetsCache=true /p:DisableTransitiveFrameworkReferences=true which workarounds dotnet store and publish behaviour changes in preview 6
CALL %RepoRoot%\build.cmd -forceCoreMsbuild -arch x86 -projects %~dp0LoggingBranch\LB.csproj /bl:artifacts/log/SiteExtensions-LoggingBranch-x86.binlog %* CALL %RepoRoot%\build.cmd -forceCoreMsbuild -arch x64 -projects %~dp0LoggingBranch\LB.csproj /p:DisablePackageAssetsCache=true /p:DisableTransitiveFrameworkReferences=true /bl:artifacts/log/SiteExtensions-LoggingBranch-x64.binlog %*
CALL %RepoRoot%\build.cmd -forceCoreMsbuild -arch x86 -projects %~dp0LoggingBranch\LB.csproj /p:DisablePackageAssetsCache=true /p:DisableTransitiveFrameworkReferences=true /bl:artifacts/log/SiteExtensions-LoggingBranch-x86.binlog %*
IF %ERRORLEVEL% NEQ 0 ( IF %ERRORLEVEL% NEQ 0 (
EXIT /b %ErrorLevel% EXIT /b %ErrorLevel%
@ -24,4 +25,4 @@ IF %ERRORLEVEL% NEQ 0 (
EXIT /b %ErrorLevel% EXIT /b %ErrorLevel%
) )
ECHO SiteExtensions successly built! ECHO SiteExtensions successfully built!