Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[mono] Update bundled SDKs from cli master
cli commit: d36e5ce

Microsoft.NET.Sdk:                       1.0.0-preview-62924-09;
Microsoft.NET.Sdk.Razor(new):            2.1.0;
Microsoft.NET.Sdk.Web:                   2.1.300;
Microsoft.NET.Sdk.Publish:               2.1.300;
Microsoft.NET.Sdk.Web.ProjectSystem:     2.1.300;
FSharp.NET.Sdk:                          1.0.4-bundled-0100;

Microsoft.NET.Build.Extensions:          1.0.0-preview-62924-09;

NuGet.Build.Tasks:                       4.8.0-preview1.5196;
NuGet.Build.Tasks.Pack:                  4.8.0-preview1.5196;

- Had to add nuget sources from cli's `build/NugetConfigFile.targets`.

Versions from:
https://github.com/dotnet/cli/blob/d36e5ce1619640f4516c1e89ef20cf52f1a32878/build/DependencyVersions.props
  • Loading branch information
radical committed Aug 3, 2018
1 parent c346796 commit 3f83070
Show file tree
Hide file tree
Showing 114 changed files with 1,879 additions and 827 deletions.
12 changes: 12 additions & 0 deletions NuGet.Config
Expand Up @@ -3,5 +3,17 @@
<packageSources>
<clear />
<add key="roslyn-tools" value="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" />

<add key="BlobFeed" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
<add key="aspnetcore-release" value="https://dotnet.myget.org/F/aspnetcore-release/api/v3/index.json" />
<add key="aspnetcore-dev" value="https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json" />
<add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
<add key="roslyn" value="https://dotnet.myget.org/f/roslyn/api/v3/index.json" />
<add key="nuget-build" value="https://dotnet.myget.org/F/nuget-build/api/v3/index.json" />
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
<add key="container-tools" value="https://www.myget.org/F/container-tools-for-visual-studio/api/v3/index.json" />
<add key="linux-musl-bootstrap-feed" value="https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20180420-03/aspnet-inputs/index.json" />
<add key="dotnet-msbuild" value="https://dotnet.myget.org/F/msbuild/api/v3/index.json" />

</packageSources>
</configuration>
Expand Up @@ -14,8 +14,7 @@ Copyright (c) .NET Foundation. All rights reserved.
<PropertyGroup>
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>

<_TargetFrameworkVersionWithoutV>$(TargetFrameworkVersion)</_TargetFrameworkVersionWithoutV>
<_TargetFrameworkVersionWithoutV Condition="$(TargetFrameworkVersion.StartsWith('v'))">$(TargetFrameworkVersion.Substring(1))</_TargetFrameworkVersionWithoutV>
<_TargetFrameworkVersionWithoutV>$(TargetFrameworkVersion.TrimStart('vV'))</_TargetFrameworkVersionWithoutV>

<MicrosoftNETBuildExtensionsTasksAssembly Condition="'$(MicrosoftNETBuildExtensionsTasksAssembly)' == '' AND '$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)\tools\netcoreapp2.0\Microsoft.NET.Build.Extensions.Tasks.dll</MicrosoftNETBuildExtensionsTasksAssembly>
<MicrosoftNETBuildExtensionsTasksAssembly Condition="'$(MicrosoftNETBuildExtensionsTasksAssembly)' == ''">$(MSBuildThisFileDirectory)\tools\net46\Microsoft.NET.Build.Extensions.Tasks.dll</MicrosoftNETBuildExtensionsTasksAssembly>
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
18 changes: 9 additions & 9 deletions mono/build/SdkVersions.txt
@@ -1,10 +1,10 @@
OldCLICommitHash=8c937a0db08e56660aca456ac088f2d0e70735ab;
NuGet.Build.Tasks.Pack=4.7.0-rtm.5081;
Microsoft.NET.Sdk=2.1.300-preview3-62804-06;
Microsoft.NET.Sdk.Razor=2.1.0-preview2-30475;
Microsoft.NET.Sdk.Web=2.1.300-preview2-20180406-1563552;
Microsoft.NET.Sdk.Publish=2.1.300-preview2-20180406-1563552;
Microsoft.NET.Sdk.Web.ProjectSystem=2.1.300-preview2-20180406-1563552;
OldCLICommitHash=d36e5ce1619640f4516c1e89ef20cf52f1a32878;
NuGet.Build.Tasks.Pack=4.8.0-preview1.5196;
Microsoft.NET.Sdk=1.0.0-preview-62924-09;
Microsoft.NET.Sdk.Razor=2.1.0;
Microsoft.NET.Sdk.Web=2.1.300;
Microsoft.NET.Sdk.Publish=2.1.300;
Microsoft.NET.Sdk.Web.ProjectSystem=2.1.300;
FSharp.NET.Sdk=1.0.4-bundled-0100;
Microsoft.NET.Build.Extensions=2.1.300-preview3-62804-06;
NuGet.Build.Tasks=4.7.0-rtm.5081;
Microsoft.NET.Build.Extensions=1.0.0-preview-62924-09;
NuGet.Build.Tasks=4.8.0-preview1.5196;
1 change: 1 addition & 0 deletions mono/build/common.props
Expand Up @@ -11,5 +11,6 @@

<RestoreSources>$(RestoreSources);https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json</RestoreSources>
<RestoreSources>$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
<RestoreSources>$(RestoreSources);https://dotnet.myget.org/F/nuget-build/api/v3/index.json</RestoreSources>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion nuget-support/nuget.build.tasks.version
@@ -1 +1 @@
4.7.0-rtm.5081
4.8.0-preview1.5196
Binary file modified nuget-support/tasks-targets/NuGet.Build.Tasks.dll
Binary file not shown.
10 changes: 5 additions & 5 deletions nuget-support/tasks-targets/NuGet.Build.Tasks.xml

Large diffs are not rendered by default.

Binary file modified nuget-support/tasks-targets/NuGet.Commands.dll
Binary file not shown.
184 changes: 92 additions & 92 deletions nuget-support/tasks-targets/NuGet.Commands.xml

Large diffs are not rendered by default.

Binary file modified nuget-support/tasks-targets/NuGet.Common.dll
Binary file not shown.
51 changes: 40 additions & 11 deletions nuget-support/tasks-targets/NuGet.Common.xml

Large diffs are not rendered by default.

Binary file modified nuget-support/tasks-targets/NuGet.Configuration.dll
Binary file not shown.
50 changes: 25 additions & 25 deletions nuget-support/tasks-targets/NuGet.Configuration.xml

Large diffs are not rendered by default.

Binary file modified nuget-support/tasks-targets/NuGet.Credentials.dll
Binary file not shown.
Binary file modified nuget-support/tasks-targets/NuGet.DependencyResolver.Core.dll
Binary file not shown.
18 changes: 9 additions & 9 deletions nuget-support/tasks-targets/NuGet.DependencyResolver.Core.xml

Large diffs are not rendered by default.

Binary file modified nuget-support/tasks-targets/NuGet.Frameworks.dll
Binary file not shown.
86 changes: 43 additions & 43 deletions nuget-support/tasks-targets/NuGet.Frameworks.xml

Large diffs are not rendered by default.

Binary file modified nuget-support/tasks-targets/NuGet.LibraryModel.dll
Binary file not shown.
2 changes: 1 addition & 1 deletion nuget-support/tasks-targets/NuGet.LibraryModel.xml

Large diffs are not rendered by default.

Binary file modified nuget-support/tasks-targets/NuGet.Packaging.Core.dll
Binary file not shown.
10 changes: 5 additions & 5 deletions nuget-support/tasks-targets/NuGet.Packaging.Core.xml

Large diffs are not rendered by default.

Binary file modified nuget-support/tasks-targets/NuGet.Packaging.dll
Binary file not shown.
705 changes: 534 additions & 171 deletions nuget-support/tasks-targets/NuGet.Packaging.xml

Large diffs are not rendered by default.

Binary file modified nuget-support/tasks-targets/NuGet.ProjectModel.dll
Binary file not shown.
26 changes: 13 additions & 13 deletions nuget-support/tasks-targets/NuGet.ProjectModel.xml

Large diffs are not rendered by default.

Binary file modified nuget-support/tasks-targets/NuGet.Protocol.dll
Binary file not shown.
297 changes: 151 additions & 146 deletions nuget-support/tasks-targets/NuGet.Protocol.xml

Large diffs are not rendered by default.

Binary file modified nuget-support/tasks-targets/NuGet.Versioning.dll
Binary file not shown.
20 changes: 10 additions & 10 deletions nuget-support/tasks-targets/NuGet.Versioning.xml

Large diffs are not rendered by default.

@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
This file is used by the publish/package process of your Web project. You can customize the behavior of this process
by editing this MSBuild file. In order to learn more about this please visit http://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<WebPublishMethod>FileSystem</WebPublishMethod>
<publishUrl>$(OutputPath)Publish\</publishUrl>
<DeleteExistingFiles>False</DeleteExistingFiles>
</PropertyGroup>
</Project>
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<WebPublishMethod>MSDeploy</WebPublishMethod>
<LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<SkipExtraFilesOnServer>True</SkipExtraFilesOnServer>
<MSDeployPublishMethod>WMSVC</MSDeployPublishMethod>
<EnableMSDeployBackup>True</EnableMSDeployBackup>
</PropertyGroup>
</Project>
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<WebPublishMethod>Package</WebPublishMethod>
<LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<DesktopBuildPackageLocation>$(OutputPath)Publish\MSDeployPackage.zip</DesktopBuildPackageLocation>
<DeployIisAppPath>Default Web Site</DeployIisAppPath>
</PropertyGroup>
</Project>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Expand Up @@ -6,7 +6,7 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
created a backup copy. Incorrect changes to this file will make it
impossible to load or build your projects from the command-line or the IDE.
Copyright (c) .NET Foundation. All rights reserved.
Copyright (c) .NET Foundation. All rights reserved.
***********************************************************************************************
-->
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
Expand Down Expand Up @@ -48,8 +48,8 @@ Copyright (c) .NET Foundation. All rights reserved.
<ProjectCapability Include="DynamicDependentFile" />
<ProjectCapability Include="DynamicFileNesting" />

<!--
Enables UI for managing secret values when Microsoft.Extensions.Configuration.UserSecrets 1.x is referenced.
<!--
Enables UI for managing secret values when Microsoft.Extensions.Configuration.UserSecrets 1.x is referenced.
Newer versions of this package include a MSBuild file to set this ProjectCapability, but older versions did not include this.
See https://github.com/aspnet/Configuration/blob/9135af4b4e95c080ca4a9f0e91ba5a0b8a561c96/src/Microsoft.Extensions.Configuration.UserSecrets/build/netstandard1.0/Microsoft.Extensions.Configuration.UserSecrets.targets#L10
-->
Expand Down
153 changes: 153 additions & 0 deletions sdks/Microsoft.NET.Sdk.Web/Sdk/Sdk.DefaultItems.targets
@@ -0,0 +1,153 @@
<!--
***********************************************************************************************
Sdk.DefaultItems.targets
WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
created a backup copy. Incorrect changes to this file will make it
impossible to load or build your projects from the command-line or the IDE.
Copyright (c) .NET Foundation. All rights reserved.
***********************************************************************************************
-->
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!--
Determine the version (including patch) of ASPNET Core to target.
When targeting ASPNET Core, the TargetFramework is used to specify the major and minor version of the runtime to use.
By default, the patch version is inferred. The general logic is that self-contained apps will target the latest patch
that the SDK knows about, while framework-dependent apps will target the ".0" patch (and roll forward to the latest
patch installed at runtime).
The TargetLatestAspNetCoreRuntimePatch property can be set to true or false to explicitly opt in or out of the logic
to roll forward to the latest patch, regardless of whether the app is self-contained or framework-dependent. The
default value of this property is TargetLatestRuntimePatch set by the dotnet SDK.
The AspNetCoreAppRuntimeFrameworkVersion and AspNetCoreAllRuntimeFrameworkVersion are where the actual versions of the
ASPNET Core runtimes to target is stored. They are the versions that are used in the implicit PackageReference to
Microsoft.AspNetCore.App and Microsoft.AspNetCore.All. The AspNetCoreAppRuntimeFrameworkVersion and
AspNetCoreAllRuntimeFrameworkVersion can also be set explicitly, which will disable all the other logic that
automatically selects the version of .NET Core to target.
The framework version that is written to the runtimeconfig.json file is based on the actual resolved package version
of Microsoft.AspNetCore.App or Microsoft.AspNetCore.All. This is to allow floating the version number (i.e. the user
could set the version to "2.0-*".
-->
<Choose>
<When Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'" >

<PropertyGroup>
<!-- These properties will allow the latest patch versions to be set in the CLI (via BundledVersions.props) or overridden by tests -->
<DefaultPatchVersionForAspNetCoreAll2_1 Condition="'$(DefaultPatchVersionForAspNetCoreAll2_1)' == ''">2.1.1</DefaultPatchVersionForAspNetCoreAll2_1>
<DefaultPatchVersionForAspNetCoreApp2_1 Condition="'$(DefaultPatchVersionForAspNetCoreApp2_1)' == ''">2.1.1</DefaultPatchVersionForAspNetCoreApp2_1>
</PropertyGroup>

<!-- Default patch version of .All Framework -->
<PropertyGroup Condition="'$(DefaultAspNetCoreAllPatchVersion)' == ''">
<DefaultAspNetCoreAllPatchVersion Condition="'$(_TargetFrameworkVersionWithoutV)' == '2.1'">$(DefaultPatchVersionForAspNetCoreAll2_1)</DefaultAspNetCoreAllPatchVersion>

<!-- If targeting the same pre-release that is bundled with the .NET Core SDK, use the bundled package version
provided by Microsoft.NETCoreSdk.BundledVersions.props -->
<DefaultAspNetCoreAllPatchVersion Condition="'$(DefaultAspNetCoreAllPatchVersion)' == '' AND '$(_TargetFrameworkVersionWithoutV)' == '$(BundledAspNetCoreAllTargetFrameworkVersion)'">$(BundledAspNetCoreAllPackageVersion)</DefaultAspNetCoreAllPatchVersion>
<!-- If not covered by the previous cases use the target framework version for the default patch version -->
<DefaultAspNetCoreAllPatchVersion Condition="'$(DefaultAspNetCoreAllPatchVersion)' == ''">$(_TargetFrameworkVersionWithoutV)</DefaultAspNetCoreAllPatchVersion>
</PropertyGroup>

<!-- Default patch version of .App Framework -->
<PropertyGroup Condition="'$(DefaultAspNetCoreAppPatchVersion)' == ''">
<DefaultAspNetCoreAppPatchVersion Condition="'$(_TargetFrameworkVersionWithoutV)' == '2.1'">$(DefaultPatchVersionForAspNetCoreApp2_1)</DefaultAspNetCoreAppPatchVersion>

<!-- If targeting the same pre-release that is bundled with the .NET Core SDK, use the bundled package version
provided by Microsoft.NETCoreSdk.BundledVersions.props -->
<DefaultAspNetCoreAppPatchVersion Condition="'$(DefaultAspNetCoreAppPatchVersion)' == '' AND '$(_TargetFrameworkVersionWithoutV)' == '$(BundledAspNetCoreAppTargetFrameworkVersion)'">$(BundledAspNetCoreAppPackageVersion)</DefaultAspNetCoreAppPatchVersion>
<!-- If not covered by the previous cases use the target framework version for the default patch version -->
<DefaultAspNetCoreAppPatchVersion Condition="'$(DefaultAspNetCoreAppPatchVersion)' == ''">$(_TargetFrameworkVersionWithoutV)</DefaultAspNetCoreAppPatchVersion>
</PropertyGroup>

<!-- Latest patch version of .All Framework -->
<PropertyGroup Condition="'$(LatestAspNetCoreAllPatchVersion)' == ''">
<!-- Placeholder for setting latest patch version using the bundled version from CLI for previous TFMs, this will not apply until 2.2 -->
<!-- <LatestAspNetCoreAllPatchVersion Condition="'$(_TargetFrameworkVersionWithoutV)' == '2.1'">$(LatestPatchVersionForAspNetCoreAll2_1)</LatestAspNetCoreAllPatchVersion> -->

<!-- If targeting the same release that is bundled with the .NET Core SDK, use the bundled package version
provided by Microsoft.NETCoreSdk.BundledVersions.props -->
<LatestAspNetCoreAllPatchVersion Condition="'$(_TargetFrameworkVersionWithoutV)' == '$(BundledAspNetCoreAllTargetFrameworkVersion)'">$(BundledAspNetCoreAllPackageVersion)</LatestAspNetCoreAllPatchVersion>
<!-- If not covered by the previous cases use the target framework version for the latest patch version -->
<LatestAspNetCoreAllPatchVersion Condition="'$(LatestAspNetCoreAllPatchVersion)' == ''">$(_TargetFrameworkVersionWithoutV)</LatestAspNetCoreAllPatchVersion>
</PropertyGroup>

<!-- Latest patch version of .App Framework -->
<PropertyGroup Condition="'$(LatestAspNetCoreAppPatchVersion)' == ''">
<!-- Placeholder for setting latest patch version using the bundled version from CLI for previous TFMs, this will not apply until 2.2 -->
<!-- <LatestAspNetCoreAppPatchVersion Condition="'$(_TargetFrameworkVersionWithoutV)' == '2.1'">$(LatestPatchVersionForAspNetCoreApp2_1)</LatestAspNetCoreAppPatchVersion> -->

<!-- If targeting the same release that is bundled with the .NET Core SDK, use the bundled package version
provided by Microsoft.NETCoreSdk.BundledVersions.props -->
<LatestAspNetCoreAppPatchVersion Condition="'$(_TargetFrameworkVersionWithoutV)' == '$(BundledAspNetCoreAppTargetFrameworkVersion)'">$(BundledAspNetCoreAppPackageVersion)</LatestAspNetCoreAppPatchVersion>
<!-- If not covered by the previous cases use the target framework version for the latest patch version -->
<LatestAspNetCoreAppPatchVersion Condition="'$(LatestAspNetCoreAppPatchVersion)' == ''">$(_TargetFrameworkVersionWithoutV)</LatestAspNetCoreAppPatchVersion>
</PropertyGroup>

<!-- Determine the default values of TargetLatestAspNetCoreRuntimePatch -->
<PropertyGroup Condition="'$(TargetLatestAspNetCoreRuntimePatch)' == ''">
<TargetLatestAspNetCoreRuntimePatch>false</TargetLatestAspNetCoreRuntimePatch>
<TargetLatestAspNetCoreRuntimePatch Condition="'$(SelfContained)' == 'true'">true</TargetLatestAspNetCoreRuntimePatch>
<TargetLatestAspNetCoreRuntimePatch Condition="'$(TargetLatestRuntimePatch)' != ''">$(TargetLatestRuntimePatch)</TargetLatestAspNetCoreRuntimePatch>
</PropertyGroup>

<!-- Set the framework version of .All Framework -->
<PropertyGroup Condition="'$(AspNetCoreAllRuntimeFrameworkVersion)' == ''">
<AspNetCoreAllRuntimeFrameworkVersion>$(DefaultAspNetCoreAllPatchVersion)</AspNetCoreAllRuntimeFrameworkVersion>
<AspNetCoreAllRuntimeFrameworkVersion Condition="'$(TargetLatestAspNetCoreRuntimePatch)' == 'true'">$(LatestAspNetCoreAllPatchVersion)</AspNetCoreAllRuntimeFrameworkVersion>
</PropertyGroup>

<!-- Set the framework version of .App Framework -->
<PropertyGroup Condition="'$(AspNetCoreAppRuntimeFrameworkVersion)' == ''">
<AspNetCoreAppRuntimeFrameworkVersion >$(DefaultAspNetCoreAppPatchVersion)</AspNetCoreAppRuntimeFrameworkVersion>
<AspNetCoreAppRuntimeFrameworkVersion Condition="'$(TargetLatestAspNetCoreRuntimePatch)' == 'true'">$(LatestAspNetCoreAppPatchVersion)</AspNetCoreAppRuntimeFrameworkVersion>
</PropertyGroup>

<PropertyGroup>
<_AspNetCoreAllPackageName>Microsoft.AspNetCore.All</_AspNetCoreAllPackageName>
<_AspNetCoreAppPackageName>Microsoft.AspNetCore.App</_AspNetCoreAppPackageName>
</PropertyGroup>

<ItemGroup>
<!-- Determine if ASPNET metapackage references without version numbers exist -->
<_AspNetCoreAllReference Include="@(PackageReference->WithMetadataValue('Identity', '$(_AspNetCoreAllPackageName)'))" />
<_ExplicitAspNetCoreAllReference Include="@(_AspNetCoreAllReference->HasMetadata('Version'))" />
<_AspNetCoreAppReference Include="@(PackageReference->WithMetadataValue('Identity', '$(_AspNetCoreAppPackageName)'))" />
<_ExplicitAspNetCoreAppReference Include="@(_AspNetCoreAppReference->HasMetadata('Version'))" />

<!-- Update implicit ASPNET metapackage references if needed -->
<PackageReference
Update="$(_AspNetCoreAllPackageName)"
Condition="'@(_AspNetCoreAllReference->Count())' == '1' AND '@(_ExplicitAspNetCoreAllReference->Count())' == '0'">
<Version>$(AspNetCoreAllRuntimeFrameworkVersion)</Version>
<IsImplicitlyDefined>true</IsImplicitlyDefined>
<PrivateAssets>All</PrivateAssets>
<Publish>true</Publish>
</PackageReference>
<PackageReference
Update="$(_AspNetCoreAppPackageName)"
Condition="'@(_AspNetCoreAppReference->Count())' == '1' AND '@(_ExplicitAspNetCoreAppReference->Count())' == '0'">
<Version>$(AspNetCoreAppRuntimeFrameworkVersion)</Version>
<IsImplicitlyDefined>true</IsImplicitlyDefined>
<PrivateAssets>All</PrivateAssets>
<Publish>true</Publish>
</PackageReference>

<!-- Update list of implicit platform packages which require version verification -->
<ExpectedPlatformPackages
Include="$(_AspNetCoreAllPackageName)"
ExpectedVersion="$(AspNetCoreAllRuntimeFrameworkVersion)"
Condition="'@(_AspNetCoreAllReference->Count())' == '1' AND '@(_ExplicitAspNetCoreAllReference->Count())' == '0'"/>
<ExpectedPlatformPackages
Include="$(_AspNetCoreAppPackageName)"
ExpectedVersion="$(AspNetCoreAppRuntimeFrameworkVersion)"
Condition="'@(_AspNetCoreAppReference->Count())' == '1' AND '@(_ExplicitAspNetCoreAppReference->Count())' == '0'"/>
</ItemGroup>

</When>
</Choose>
</Project>
8 changes: 5 additions & 3 deletions sdks/Microsoft.NET.Sdk.Web/Sdk/Sdk.targets
Expand Up @@ -6,17 +6,19 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
created a backup copy. Incorrect changes to this file will make it
impossible to load or build your projects from the command-line or the IDE.
Copyright (c) .NET Foundation. All rights reserved.
Copyright (c) .NET Foundation. All rights reserved.
***********************************************************************************************
-->
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />

<Import Sdk="Microsoft.NET.Sdk.Razor" Project="Sdk.targets" />

<Import Sdk="Microsoft.NET.Sdk.Web.ProjectSystem" Project="Sdk.targets" />

<Import Sdk="Microsoft.NET.Sdk.Publish" Project="Sdk.targets" />

<Import Project="$(MSBuildThisFileDirectory)Sdk.DefaultItems.targets" />

</Project>
4 changes: 4 additions & 0 deletions sdks/Microsoft.NET.Sdk/Sdk/Sdk.props
Expand Up @@ -26,6 +26,10 @@ Copyright (c) .NET Foundation. All rights reserved.
<UsingMicrosoftNETSdk>true</UsingMicrosoftNETSdk>
</PropertyGroup>

<PropertyGroup Condition="'$(MSBuildProjectFullPath)' == '$(ProjectToOverrideProjectExtensionsPath)'">
<MSBuildProjectExtensionsPath>$(ProjectExtensionsPathForSpecifiedProject)</MSBuildProjectExtensionsPath>
</PropertyGroup>

<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
<Import Project="$(MSBuildThisFileDirectory)..\targets\Microsoft.NET.Sdk.props" />
</Project>

0 comments on commit 3f83070

Please sign in to comment.