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

Update the SDK (#8670)

This commit is contained in:
Justin Kotalik 2019-04-01 15:18:18 -07:00 committed by Andrew Stanton-Nurse
parent d86c9b3f07
commit df3a702190
11 changed files with 40 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.azure/pipelines/ci.yml
View File

@ -62,6 +62,10 @@ jobs:
- script: ./build.cmd -ci -sign -forceCoreMsbuild /p:DisableCodeSigning=true -projects ./src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj
displayName: Build SiteExtension
# Remove all task build output
- script: rmdir /s /q build\tasks\bin
displayName: Clear task build output
# This runs code-signing on all packages, zips, and jar files as defined in build/CodeSign.targets. If https://github.com/dotnet/arcade/issues/1957 is resolved,
# consider running code-signing inline with the other previous steps.
# Sign check is disabled because it is run in a separate step below, after installers are built.

6
Directory.Build.targets
View File

@ -87,11 +87,15 @@
<TargetingPackVersion Condition="'$(IsServicingBuild)' != 'true'">$(MicrosoftNETCoreAppPackageVersion)</TargetingPackVersion>
</KnownFrameworkReference>
<KnownFrameworkReference Update="Microsoft.AspNetCore.App">
<KnownFrameworkReference Condition="'$(UseAspNetCoreSharedRuntime)' != 'true'" Remove="Microsoft.AspNetCore.App" />
<KnownFrameworkReference Remove="Microsoft.WindowsDesktop.App" />
<KnownFrameworkReference Condition="'$(UseAspNetCoreSharedRuntime)' == 'true'" Update="Microsoft.AspNetCore.App">
<LatestRuntimeFrameworkVersion>$(SharedFxVersion)</LatestRuntimeFrameworkVersion>
<DefaultRuntimeFrameworkVersion Condition="'$(IsServicingBuild)' != 'true'">$(SharedFxVersion)</DefaultRuntimeFrameworkVersion>
<TargetingPackVersion Condition="'$(IsServicingBuild)' != 'true'">$(SharedFxVersion)</TargetingPackVersion>
</KnownFrameworkReference>
</ItemGroup>
<Import Project="eng\Workarounds.targets" />

10
eng/Dependencies.props
View File

@ -166,6 +166,16 @@ and are generated based on the last package release.
<LatestPackageReference Include="xunit.runner.console" Version="$(XunitRunnerConsolePackageVersion)" />
<LatestPackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualStudioPackageVersion)" />
<LatestPackageReference Include="xunit" Version="$(XunitPackageVersion)" />
<!-- Runtime packages required for crossgen -->
<LatestPackageReference Include="runtime.win-x64.microsoft.netcore.app" Version="$(MicrosoftNETCoreAppPackageVersion)" />
<LatestPackageReference Include="runtime.win-x86.microsoft.netcore.app" Version="$(MicrosoftNETCoreAppPackageVersion)" />
<LatestPackageReference Include="runtime.win-arm.microsoft.netcore.app" Version="$(MicrosoftNETCoreAppPackageVersion)" />
<LatestPackageReference Include="runtime.osx-x64.microsoft.netcore.app" Version="$(MicrosoftNETCoreAppPackageVersion)" />
<LatestPackageReference Include="runtime.linux-x64.microsoft.netcore.app" Version="$(MicrosoftNETCoreAppPackageVersion)" />
<LatestPackageReference Include="runtime.linux-arm.microsoft.netcore.app" Version="$(MicrosoftNETCoreAppPackageVersion)" />
<LatestPackageReference Include="runtime.linux-arm64.microsoft.netcore.app" Version="$(MicrosoftNETCoreAppPackageVersion)" />
<LatestPackageReference Include="runtime.linux-musl-x64.microsoft.netcore.app" Version="$(MicrosoftNETCoreAppPackageVersion)" />
</ItemGroup>
</Project>

4
korebuild-lock.txt
View File

@ -1,2 +1,2 @@
version:3.0.0-build-20190314.2
commithash:e3a8a2aae198f1ef26309714ccba6835be2437c3
version:3.0.0-build-20190322.1
commithash:c38761a564c72b5bc96356ec99c89de5f281a358

7
src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj
View File

@ -112,8 +112,9 @@ This package is an internal implementation of the .NET Core SDK and is not meant
<CrossgenToolPackagePath Condition=" '$(TargetRuntimeIdentifier)' == 'linux-arm64' ">x64_arm64\$(CrossgenToolPackagePath)</CrossgenToolPackagePath>
<CrossgenToolPackagePath Condition=" '$(TargetRuntimeIdentifier)' == 'win-arm' ">x86_arm\$(CrossgenToolPackagePath)</CrossgenToolPackagePath>
<RuntimePackageRoot>$(NuGetPackageRoot)/runtime.$(RuntimeIdentifier).microsoft.netcore.app/$(MicrosoftNETCoreAppPackageVersion)/</RuntimePackageRoot>
<CrossgenToolPath>$(RuntimePackageRoot)tools/$(CrossgenToolPackagePath)</CrossgenToolPath>
<RuntimePackageRoot>$([System.IO.Path]::Combine('$(NuGetPackageRoot)', 'runtime.$(RuntimeIdentifier).microsoft.netcore.app', '$(MicrosoftNETCoreAppPackageVersion)'))</RuntimePackageRoot>
<RuntimePackageRoot>$([MSBuild]::EnsureTrailingSlash('$(RuntimePackageRoot)'))</RuntimePackageRoot>
<CrossgenToolPath>$([System.IO.Path]::Combine('$(RuntimePackageRoot)', 'tools', '$(CrossgenToolPackagePath)'))</CrossgenToolPath>
<AssetTargetFallback>$(AssetTargetFallback);native,Version=0.0</AssetTargetFallback>
</PropertyGroup>
@ -123,6 +124,8 @@ This package is an internal implementation of the .NET Core SDK and is not meant
<IncludeAssets>Runtime;Native</IncludeAssets>
</Reference>
<Reference Include="runtime.$(RuntimeIdentifier).microsoft.netcore.app" PrivateAssets="All" />
<ProjectReference Condition="'$(BuildIisNativeProjects)' == 'true' AND '$(BuildNative)' != 'false' AND '$(VCTargetsPath)' != ''" Include="$(RepositoryRoot)src\Servers\IIS\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj">
<SetPlatform>Platform=$(TargetArchitecture)</SetPlatform>
<SetPlatform Condition="'$(TargetArchitecture)' == 'x86'">Platform=Win32</SetPlatform>

2
src/Mvc/Mvc.Analyzers/src/Microsoft.AspNetCore.Mvc.Analyzers.csproj
View File

@ -15,7 +15,7 @@
<Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" PrivateAssets="All" />
</ItemGroup>
<Target Name="PopulateNuspec" BeforeTargets="GenerateNuspec" DependsOnTargets="Build">
<Target Name="PopulateNuspec" BeforeTargets="GenerateNuspec">
<PropertyGroup>
<NuspecProperties>

2
src/Mvc/Mvc.Api.Analyzers/src/Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj
View File

@ -20,7 +20,7 @@
<Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" PrivateAssets="All" />
</ItemGroup>
<Target Name="PopulateNuspec" BeforeTargets="GenerateNuspec" DependsOnTargets="Build">
<Target Name="PopulateNuspec" BeforeTargets="GenerateNuspec" >
<PropertyGroup>
<NuspecProperties>

5
src/Tools/dotnet-watch/test/AppWithDepsTests.cs
View File

@ -1,10 +1,11 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
using System.IO;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Testing;
using Microsoft.AspNetCore.Testing.xunit;
using Xunit;
using Xunit.Abstractions;
@ -19,7 +20,7 @@ namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
_app = new AppWithDeps(logger);
}
[Fact]
[Fact(Skip = "https://github.com/aspnet/AspNetCore/issues/8267")]
public async Task ChangeFileInDependency()
{
await _app.StartWatcherAsync();

10
src/Tools/dotnet-watch/test/GlobbingAppTests.cs
View File

@ -6,6 +6,7 @@ using System.IO;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Testing;
using Microsoft.AspNetCore.Testing.xunit;
using Microsoft.DotNet.Watcher.Tools.Tests;
using Xunit;
@ -21,10 +22,9 @@ namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
_app = new GlobbingApp(logger);
}
[ConditionalTheory]
[Theory(Skip = "https://github.com/aspnet/AspNetCore/issues/8267")]
[InlineData(true)]
[InlineData(false)]
[SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/8267
public async Task ChangeCompiledFile(bool usePollingWatcher)
{
_app.UsePollingWatcher = usePollingWatcher;
@ -42,8 +42,7 @@ namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
Assert.Equal(2, types);
}
[ConditionalFact]
[SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/8267
[Fact(Skip = "https://github.com/aspnet/AspNetCore/issues/8267")]
public async Task DeleteCompiledFile()
{
await _app.StartWatcherAsync();
@ -59,8 +58,7 @@ namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
Assert.Equal(1, types);
}
[ConditionalFact]
[SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/8267
[Fact(Skip = "https://github.com/aspnet/AspNetCore/issues/8267")]
public async Task DeleteSourceFolder()
{
await _app.StartWatcherAsync();

4
src/Tools/dotnet-watch/test/NoDepsAppTests.cs
View File

@ -5,6 +5,7 @@ using System;
using System.Diagnostics;
using System.IO;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Testing;
using Microsoft.AspNetCore.Testing.xunit;
using Xunit;
using Xunit.Abstractions;
@ -24,8 +25,7 @@ namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
_output = logger;
}
[ConditionalFact]
[SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/8267
[Fact(Skip = "https://github.com/aspnet/AspNetCore/issues/8267")]
public async Task RestartProcessOnFileChange()
{
await _app.StartWatcherAsync(new[] { "--no-exit" });

3
src/Tools/startvs.cmd Normal file
View File

@ -0,0 +1,3 @@
@ECHO OFF
%~dp0..\..\startvs.cmd %~dp0Tools.sln