Skip to content
This repository was archived by the owner on Feb 15, 2023. It is now read-only.

Commit 3bdc5e8

Browse files
vijayrknvijayrkn
authored
Merge master to Release/3.0 branch (#538)
* Update dependencies from https://github.com/aspnet/AspNetCore build 3.0.0-preview4-19163-08 (#516) This change updates the following dependencies - Microsoft.AspNetCore.Mvc.Analyzers - 3.0.0-preview4-19163-08 - Microsoft.AspNetCore.Mvc.Api.Analyzers - 3.0.0-preview4-19163-08 - Microsoft.AspNetCore.Mvc.Analyzers - 3.0.0-preview4-19163-08 - Microsoft.AspNetCore.Mvc.Api.Analyzers - 3.0.0-preview4-19163-08 - Microsoft.AspNetCore.Mvc.Analyzers - 3.0.0-preview4-19163-08 - Microsoft.AspNetCore.Mvc.Api.Analyzers - 3.0.0-preview4-19163-08 - Microsoft.AspNetCore.Mvc.Api.Analyzers - 3.0.0-preview4-19163-08 - Microsoft.AspNetCore.Mvc.Analyzers - 3.0.0-preview4-19163-08 - Microsoft.AspNetCore.Mvc.Analyzers - 3.0.0-preview4-19163-08 - Microsoft.AspNetCore.Mvc.Api.Analyzers - 3.0.0-preview4-19163-08 - Microsoft.AspNetCore.Mvc.Api.Analyzers - 3.0.0-preview4-19163-08 - Microsoft.AspNetCore.Mvc.Analyzers - 3.0.0-preview4-19163-08 - Microsoft.AspNetCore.Mvc.Api.Analyzers - 3.0.0-preview4-19163-08 - Microsoft.AspNetCore.Mvc.Analyzers - 3.0.0-preview4-19163-08 * Update dependencies from https://github.com/aspnet/AspNetCore build 3.0.0-preview4-19165-04 (#517) This change updates the following dependencies - Microsoft.AspNetCore.Mvc.Analyzers - 3.0.0-preview4-19165-04 - Microsoft.AspNetCore.Mvc.Api.Analyzers - 3.0.0-preview4-19165-04 - Microsoft.AspNetCore.Mvc.Analyzers - 3.0.0-preview4-19165-04 - Microsoft.AspNetCore.Mvc.Api.Analyzers - 3.0.0-preview4-19165-04 - Microsoft.AspNetCore.Mvc.Analyzers - 3.0.0-preview4-19165-04 - Microsoft.AspNetCore.Mvc.Api.Analyzers - 3.0.0-preview4-19165-04 - Microsoft.AspNetCore.Mvc.Api.Analyzers - 3.0.0-preview4-19165-04 - Microsoft.AspNetCore.Mvc.Analyzers - 3.0.0-preview4-19165-04 - Microsoft.AspNetCore.Mvc.Analyzers - 3.0.0-preview4-19165-04 - Microsoft.AspNetCore.Mvc.Api.Analyzers - 3.0.0-preview4-19165-04 - Microsoft.AspNetCore.Mvc.Api.Analyzers - 3.0.0-preview4-19165-04 - Microsoft.AspNetCore.Mvc.Analyzers - 3.0.0-preview4-19165-04 - Microsoft.AspNetCore.Mvc.Api.Analyzers - 3.0.0-preview4-19165-04 - Microsoft.AspNetCore.Mvc.Analyzers - 3.0.0-preview4-19165-04 * Update dependencies from https://github.com/aspnet/AspNetCore build 3.0.0-preview4-19166-02 (#518) This change updates the following dependencies - Microsoft.AspNetCore.Mvc.Analyzers - 3.0.0-preview4-19166-02 - Microsoft.AspNetCore.Mvc.Api.Analyzers - 3.0.0-preview4-19166-02 - Microsoft.AspNetCore.Mvc.Analyzers - 3.0.0-preview4-19166-02 - Microsoft.AspNetCore.Mvc.Api.Analyzers - 3.0.0-preview4-19166-02 - Microsoft.AspNetCore.Mvc.Analyzers - 3.0.0-preview4-19166-02 - Microsoft.AspNetCore.Mvc.Api.Analyzers - 3.0.0-preview4-19166-02 - Microsoft.AspNetCore.Mvc.Api.Analyzers - 3.0.0-preview4-19166-02 - Microsoft.AspNetCore.Mvc.Analyzers - 3.0.0-preview4-19166-02 - Microsoft.AspNetCore.Mvc.Analyzers - 3.0.0-preview4-19166-02 - Microsoft.AspNetCore.Mvc.Api.Analyzers - 3.0.0-preview4-19166-02 - Microsoft.AspNetCore.Mvc.Api.Analyzers - 3.0.0-preview4-19166-02 - Microsoft.AspNetCore.Mvc.Analyzers - 3.0.0-preview4-19166-02 - Microsoft.AspNetCore.Mvc.Api.Analyzers - 3.0.0-preview4-19166-02 - Microsoft.AspNetCore.Mvc.Analyzers - 3.0.0-preview4-19166-02 * Update dependencies from https://github.com/aspnet/AspNetCore build 3.0.0-preview4-19168-01 (#519) This change updates the following dependencies - Microsoft.AspNetCore.Mvc.Analyzers - 3.0.0-preview4-19168-01 - Microsoft.AspNetCore.Mvc.Api.Analyzers - 3.0.0-preview4-19168-01 - Microsoft.AspNetCore.Mvc.Analyzers - 3.0.0-preview4-19168-01 - Microsoft.AspNetCore.Mvc.Api.Analyzers - 3.0.0-preview4-19168-01 - Microsoft.AspNetCore.Mvc.Analyzers - 3.0.0-preview4-19168-01 - Microsoft.AspNetCore.Mvc.Api.Analyzers - 3.0.0-preview4-19168-01 - Microsoft.AspNetCore.Mvc.Api.Analyzers - 3.0.0-preview4-19168-01 - Microsoft.AspNetCore.Mvc.Analyzers - 3.0.0-preview4-19168-01 - Microsoft.AspNetCore.Mvc.Analyzers - 3.0.0-preview4-19168-01 - Microsoft.AspNetCore.Mvc.Api.Analyzers - 3.0.0-preview4-19168-01 - Microsoft.AspNetCore.Mvc.Api.Analyzers - 3.0.0-preview4-19168-01 - Microsoft.AspNetCore.Mvc.Analyzers - 3.0.0-preview4-19168-01 - Microsoft.AspNetCore.Mvc.Api.Analyzers - 3.0.0-preview4-19168-01 - Microsoft.AspNetCore.Mvc.Analyzers - 3.0.0-preview4-19168-01 * Fix typo in name and sync the version numbers of Analyzer packages * Update dependencies from https://github.com/aspnet/AspNetCore build 3.0.0-preview4-19168-06 (#522) This change updates the following dependencies - Microsoft.AspNetCore.Mvc.Analyzers - 3.0.0-preview4-19168-06 - Microsoft.AspNetCore.Mvc.Api.Analyzers - 3.0.0-preview4-19168-06 - Microsoft.AspNetCore.Mvc.Analyzers - 3.0.0-preview4-19168-06 - Microsoft.AspNetCore.Mvc.Api.Analyzers - 3.0.0-preview4-19168-06 - Microsoft.AspNetCore.Mvc.Analyzers - 3.0.0-preview4-19168-06 - Microsoft.AspNetCore.Mvc.Api.Analyzers - 3.0.0-preview4-19168-06 - Microsoft.AspNetCore.Mvc.Api.Analyzers - 3.0.0-preview4-19168-06 - Microsoft.AspNetCore.Mvc.Analyzers - 3.0.0-preview4-19168-06 - Microsoft.AspNetCore.Mvc.Analyzers - 3.0.0-preview4-19168-06 - Microsoft.AspNetCore.Mvc.Api.Analyzers - 3.0.0-preview4-19168-06 - Microsoft.AspNetCore.Mvc.Api.Analyzers - 3.0.0-preview4-19168-06 - Microsoft.AspNetCore.Mvc.Analyzers - 3.0.0-preview4-19168-06 - Microsoft.AspNetCore.Mvc.Api.Analyzers - 3.0.0-preview4-19168-06 - Microsoft.AspNetCore.Mvc.Analyzers - 3.0.0-preview4-19168-06 * Update dependencies from https://github.com/aspnet/AspNetCore build 3.0.0-preview4-19170-01 (#523) - Microsoft.AspNetCore.Mvc.Analyzers - 3.0.0-preview4-19170-01 - Microsoft.AspNetCore.Mvc.Api.Analyzers - 3.0.0-preview4-19170-01 * Update dependencies from https://github.com/aspnet/AspNetCore build 3.0.0-preview4-19170-07 (#524) - Microsoft.AspNetCore.Mvc.Analyzers - 3.0.0-preview4-19170-07 - Microsoft.AspNetCore.Mvc.Api.Analyzers - 3.0.0-preview4-19170-07 * Update dependencies from https://github.com/aspnet/AspNetCore build 3.0.0-preview4-19171-04 (#525) - Microsoft.AspNetCore.Mvc.Analyzers - 3.0.0-preview4-19171-04 - Microsoft.AspNetCore.Mvc.Api.Analyzers - 3.0.0-preview4-19171-04 * Update dependencies from https://github.com/aspnet/AspNetCore build 3.0.0-preview4-19172-03 (#526) - Microsoft.AspNetCore.Mvc.Analyzers - 3.0.0-preview4-19172-03 - Microsoft.AspNetCore.Mvc.Api.Analyzers - 3.0.0-preview4-19172-03 * Set AddRazorSupportForMvc in the WebSDK (#527) Fixes dotnet/aspnetcore#6392 * Update dependencies from https://github.com/aspnet/AspNetCore build 3.0.0-preview4-19177-02 (#529) - Microsoft.AspNetCore.Mvc.Analyzers - 3.0.0-preview4-19177-02 - Microsoft.AspNetCore.Mvc.Api.Analyzers - 3.0.0-preview4-19177-02 * Change build pool for internal builds (#531) * Following the same folder structure as NetSdk (#533) * Update dependencies from https://github.com/aspnet/AspNetCore build 20190329.3 (#535) - Microsoft.AspNetCore.Mvc.Analyzers - 3.0.0-preview4-19179-03 - Microsoft.AspNetCore.Mvc.Api.Analyzers - 3.0.0-preview4-19179-03 * Update dependencies from https://github.com/aspnet/AspNetCore build 20190330.1 (#536) - Microsoft.AspNetCore.Mvc.Analyzers - 3.0.0-preview4-19180-01 - Microsoft.AspNetCore.Mvc.Api.Analyzers - 3.0.0-preview4-19180-01 * Update dependencies from https://github.com/aspnet/AspNetCore build 20190401.4 (#537) - Microsoft.AspNetCore.Mvc.Analyzers - 3.0.0-preview4-19201-04 - Microsoft.AspNetCore.Mvc.Api.Analyzers - 3.0.0-preview4-19201-04 * Moving the Import profile logic to a separate file (#534) * Moving the Import profile logic to a separate file * Removing an unwanted comment from the target file * Splitting the Sdk and targets folder
1 parent 4be4655 commit 3bdc5e8

35 files changed

+105
-77
lines changed

‎azure-pipelines.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ jobs:
3636
${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
3737
name: Hosted VS2017
3838
${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
39-
name: dotnet-internal-temp
39+
name: NetCoreInternal-Int-Pool
40+
queue: buildpool.windows.10.amd64.vs2017
4041

4142
variables:
4243
- _Script: eng\common\cibuild.cmd
@@ -134,4 +135,4 @@ jobs:
134135
--prepareMachine
135136
name: Build
136137
displayName: Build
137-
condition: succeeded()
138+
condition: succeeded()

‎eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.AspNetCore.Mvc.Analyzers" Version="3.0.0-preview4-19162-05">
4+
<Dependency Name="Microsoft.AspNetCore.Mvc.Analyzers" Version="3.0.0-preview4-19201-04">
55
<Uri>https://github.com/aspnet/AspNetCore</Uri>
6-
<Sha>2aa6c01b58bfa2b96d111e22bc49d6102cb9a7ba</Sha>
6+
<Sha>6a6a870f0847d347e72443eda843969d0b46da94</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.AspNetCore.Mvc.Api.Analyzers" Version="3.0.0-preview4-19162-05">
8+
<Dependency Name="Microsoft.AspNetCore.Mvc.Api.Analyzers" Version="3.0.0-preview4-19201-04">
99
<Uri>https://github.com/aspnet/AspNetCore</Uri>
10-
<Sha>2aa6c01b58bfa2b96d111e22bc49d6102cb9a7ba</Sha>
10+
<Sha>6a6a870f0847d347e72443eda843969d0b46da94</Sha>
1111
</Dependency>
1212
</ProductDependencies>
1313
<ToolsetDependencies>

‎eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
3131
-->
3232
<PropertyGroup Label="Automated">
33-
<MicrosoftAspNetCoreMvcAnalyzers>3.0.0-preview4-19154-11</MicrosoftAspNetCoreMvcAnalyzers>
34-
<MicrosoftAspNetCoreMvcApiAnalyzers>3.0.0-preview4-19154-11</MicrosoftAspNetCoreMvcApiAnalyzers>
33+
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>3.0.0-preview4-19201-04</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
34+
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>3.0.0-preview4-19201-04</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
3535
</PropertyGroup>
3636
</Project>

‎src/ProjectSystem/Package/Microsoft.NET.Sdk.Web.ProjectSystem.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<ProjectSystemRoot Condition="'$(ProjectSystemRoot)' == ''">$(RepoRoot)\src\ProjectSystem\</ProjectSystemRoot>
@@ -12,12 +12,12 @@
1212
</PropertyGroup>
1313

1414
<ItemGroup>
15-
<Content Include="$(ProjectSystemRoot)\Targets\netstandard1.0\**\*.*">
15+
<Content Include="$(ProjectSystemRoot)\Targets\**\*.*">
1616
<Pack>true</Pack>
17-
<PackagePath>build\netstandard1.0</PackagePath>
17+
<PackagePath>targets</PackagePath>
1818
</Content>
1919

20-
<Content Include="$(ProjectSystemRoot)\Targets\Sdk.*">
20+
<Content Include="$(ProjectSystemRoot)\Sdk\**\*.*">
2121
<Pack>true</Pack>
2222
<PackagePath>Sdk</PackagePath>
2323
</Content>

‎src/Publish/Targets/Sdk.props renamed to ‎src/ProjectSystem/Sdk/Sdk.props

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ Copyright (c) .NET Foundation. All rights reserved.
1111
-->
1212
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1313

14-
<Import Project="$(MSBuildThisFileDirectory)..\build\netstandard1.0\Microsoft.NET.Sdk.Publish.props" Condition="Exists('$(MSBuildThisFileDirectory)..\build\netstandard1.0\Microsoft.NET.Sdk.Publish.props')" />
14+
<Import Project="$(MSBuildThisFileDirectory)..\targets\Microsoft.NET.Sdk.Web.ProjectSystem.props"
15+
Condition="Exists('$(MSBuildThisFileDirectory)..\targets\Microsoft.NET.Sdk.Web.ProjectSystem.props')" />
1516

16-
</Project>
17+
</Project>

‎src/Publish/Targets/Sdk.targets renamed to ‎src/ProjectSystem/Sdk/Sdk.targets

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ Copyright (c) .NET Foundation. All rights reserved.
1111
-->
1212
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1313

14-
<Import Project="$(MSBuildThisFileDirectory)..\build\netstandard1.0\Microsoft.NET.Sdk.Publish.targets" Condition="Exists('$(MSBuildThisFileDirectory)..\build\netstandard1.0\Microsoft.NET.Sdk.Publish.targets')" />
14+
<Import Project="$(MSBuildThisFileDirectory)..\targets\Microsoft.NET.Sdk.Web.ProjectSystem.targets"
15+
Condition="Exists('$(MSBuildThisFileDirectory)..\targets\Microsoft.NET.Sdk.Web.ProjectSystem.targets')" />
1516

16-
</Project>
17+
</Project>

‎src/ProjectSystem/Targets/netstandard1.0/Microsoft.NET.Sdk.Web.ProjectSystem.props renamed to ‎src/ProjectSystem/Targets/Microsoft.NET.Sdk.Web.ProjectSystem.props

File renamed without changes.

‎src/ProjectSystem/Targets/netstandard1.0/Microsoft.NET.Sdk.Web.ProjectSystem.targets renamed to ‎src/ProjectSystem/Targets/Microsoft.NET.Sdk.Web.ProjectSystem.targets

File renamed without changes.

‎src/Publish/Package/Microsoft.NET.Sdk.Publish.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@
4141
<PackagePath>tools\netcoreapp2.1</PackagePath>
4242
</Content>
4343

44-
<Content Include="$(PublishRoot)\Targets\netstandard1.0\**\*.*">
44+
<Content Include="$(PublishRoot)\Targets\**\*.*">
4545
<Pack>true</Pack>
46-
<PackagePath>build\netstandard1.0</PackagePath>
46+
<PackagePath>targets</PackagePath>
4747
</Content>
4848

49-
<Content Include="$(PublishRoot)\Targets\Sdk.*">
49+
<Content Include="$(PublishRoot)\Sdk\**\*.*">
5050
<Pack>true</Pack>
5151
<PackagePath>Sdk</PackagePath>
5252
</Content>

‎src/Publish/Sdk/ImportPublishProfile.targets

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<!--
2+
***********************************************************************************************
3+
ImportPublishProfile.targets
4+
5+
WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
6+
created a backup copy. Incorrect changes to this file will make it
7+
impossible to load or build your projects from the command-line or the IDE.
8+
9+
Copyright (c) .NET Foundation. All rights reserved.
10+
***********************************************************************************************
11+
-->
12+
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
13+
14+
<PropertyGroup>
15+
<PublishProfileImported>true</PublishProfileImported>
16+
<_PublishProfileRootFolder Condition="'$(_PublishProfileRootFolder)' == ''">$(MSBuildProjectDirectory)\$(AppDesignerFolder)\PublishProfiles\</_PublishProfileRootFolder>
17+
<PublishProfile Condition="'$(PublishProfile)' ==''">FileSystem</PublishProfile>
18+
<PublishProfileName Condition="'$(PublishProfileName)' == ''">$([System.IO.Path]::GetFileNameWithoutExtension($(PublishProfile)))</PublishProfileName>
19+
<PublishProfileFullPath Condition="'$(PublishProfileFullPath)' == ''">$(_PublishProfileRootFolder)$(PublishProfileName).pubxml</PublishProfileFullPath>
20+
<PublishProfileFullPath Condition="!Exists('$(PublishProfileFullPath)')">$(MSBuildThisFileDirectory)PublishProfiles\$(PublishProfileName).pubxml</PublishProfileFullPath>
21+
<!-- This is what get passed from the Visual Studio UI.-->
22+
<WebPublishProfileFile Condition="'$(WebPublishProfileFile)' == ''">$(PublishProfileFullPath)</WebPublishProfileFile>
23+
</PropertyGroup>
24+
25+
<Import Project="$(WebPublishProfileFile)" Condition="Exists('$(WebPublishProfileFile)')" />
26+
<Import Project="$(WebPublishProfileFile).user" Condition="Exists('$(WebPublishProfileFile).user')" />
27+
</Project>

‎src/Publish/Targets/netstandard1.0/PublishProfiles/FileSystem.pubxml renamed to ‎src/Publish/Sdk/PublishProfiles/FileSystem.pubxml

File renamed without changes.

‎src/Publish/Targets/netstandard1.0/PublishProfiles/MSDeploy.pubxml renamed to ‎src/Publish/Sdk/PublishProfiles/MSDeploy.pubxml

File renamed without changes.

‎src/Publish/Targets/netstandard1.0/PublishProfiles/MSDeployPackage.pubxml renamed to ‎src/Publish/Sdk/PublishProfiles/MSDeployPackage.pubxml

File renamed without changes.

‎src/ProjectSystem/Targets/Sdk.props renamed to ‎src/Publish/Sdk/Sdk.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Copyright (c) .NET Foundation. All rights reserved.
1111
-->
1212
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1313

14-
<Import Project="$(MSBuildThisFileDirectory)..\build\netstandard1.0\Microsoft.NET.Sdk.Web.ProjectSystem.props"
15-
Condition="Exists('$(MSBuildThisFileDirectory)..\build\netstandard1.0\Microsoft.NET.Sdk.Web.ProjectSystem.props')" />
14+
<Import Project="$(MSBuildThisFileDirectory)..\targets\Microsoft.NET.Sdk.Publish.props"
15+
Condition="Exists('$(MSBuildThisFileDirectory)..\targets\Microsoft.NET.Sdk.Publish.props')" />
1616

17-
</Project>
17+
</Project>

‎src/ProjectSystem/Targets/Sdk.targets renamed to ‎src/Publish/Sdk/Sdk.targets

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Copyright (c) .NET Foundation. All rights reserved.
1111
-->
1212
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1313

14-
<Import Project="$(MSBuildThisFileDirectory)..\build\netstandard1.0\Microsoft.NET.Sdk.Web.ProjectSystem.targets"
15-
Condition="Exists('$(MSBuildThisFileDirectory)..\build\netstandard1.0\Microsoft.NET.Sdk.Web.ProjectSystem.targets')" />
14+
<Import Project="$(MSBuildThisFileDirectory)..\targets\Microsoft.NET.Sdk.Publish.targets"
15+
Condition="Exists('$(MSBuildThisFileDirectory)..\targets\Microsoft.NET.Sdk.Publish.targets')" />
1616

17-
</Project>
17+
</Project>

‎src/Publish/Targets/netstandard1.0/ComputeTargets/Microsoft.NET.Sdk.Publish.ComputeFiles.targets renamed to ‎src/Publish/Targets/ComputeTargets/Microsoft.NET.Sdk.Publish.ComputeFiles.targets

File renamed without changes.

‎src/Publish/Targets/netstandard1.0/CopyTargets/Microsoft.NET.Sdk.Publish.CopyFiles.targets renamed to ‎src/Publish/Targets/CopyTargets/Microsoft.NET.Sdk.Publish.CopyFiles.targets

File renamed without changes.

‎src/Publish/Targets/netstandard1.0/DotNetCLIToolTargets/Microsoft.NET.Sdk.DotNetCLITool.targets renamed to ‎src/Publish/Targets/DotNetCLIToolTargets/Microsoft.NET.Sdk.DotNetCLITool.targets

File renamed without changes.

‎src/Publish/Targets/netstandard1.0/Microsoft.NET.Sdk.Publish.props renamed to ‎src/Publish/Targets/Microsoft.NET.Sdk.Publish.props

File renamed without changes.

‎src/Publish/Targets/netstandard1.0/Microsoft.NET.Sdk.Publish.targets renamed to ‎src/Publish/Targets/Microsoft.NET.Sdk.Publish.targets

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!--
1+
<!--
22
***********************************************************************************************
33
Microsoft.NET.Sdk.Publish.targets
44
@@ -21,13 +21,12 @@ Copyright (C) Microsoft Corporation. All rights reserved.
2121
<SupportsDeployOnBuild>true</SupportsDeployOnBuild>
2222
<_PublishTaskFramework Condition=" '$(MSBuildRuntimeType)' == 'Core'">netcoreapp2.1</_PublishTaskFramework>
2323
<_PublishTaskFramework Condition=" '$(_PublishTaskFramework)' == ''">net46</_PublishTaskFramework>
24-
<_PublishTasksDir Condition=" '$(_PublishTasksDir)'=='' ">$(MSBuildThisFileDirectory)..\..\tools\$(_PublishTaskFramework)\</_PublishTasksDir>
24+
<_PublishTasksDir Condition=" '$(_PublishTasksDir)'=='' ">$(MSBuildThisFileDirectory)..\tools\$(_PublishTaskFramework)\</_PublishTasksDir>
2525
<_PublishTaskAssemblyFullPath Condition=" '$(_PublishTaskAssemblyFullPath)'=='' ">$(_PublishTasksDir)Microsoft.NET.Sdk.Publish.Tasks.dll</_PublishTaskAssemblyFullPath>
2626
<_CopyTargetsDir Condition=" '$(_CopyTargetsDir)' == ''">$(MSBuildThisFileDirectory)CopyTargets\</_CopyTargetsDir>
2727
<_TransformTargetsDir Condition=" '$(_TransformTargetsDir)' == ''">$(MSBuildThisFileDirectory)TransformTargets\</_TransformTargetsDir>
2828
<_ComputeTargetsDir Condition=" '$(_ComputeTargetsDir)'=='' ">$(MSBuildThisFileDirectory)ComputeTargets\</_ComputeTargetsDir>
2929
<_PublishTargetsDir Condition=" '$(_PublishTargetsDir)'=='' ">$(MSBuildThisFileDirectory)PublishTargets\</_PublishTargetsDir>
30-
<_PublishProfilesDir Condition=" '$(_PublishProfilesDir)'=='' ">$(MSBuildThisFileDirectory)PublishProfiles\</_PublishProfilesDir>
3130
<_DotNetCLIToolTargetsDir Condition=" '$(_DotNetCLIToolTargetsDir)'=='' ">$(MSBuildThisFileDirectory)DotNetCLIToolTargets\</_DotNetCLIToolTargetsDir>
3231
</PropertyGroup>
3332

@@ -37,23 +36,11 @@ Copyright (C) Microsoft Corporation. All rights reserved.
3736

3837
<!--
3938
***********************************************************************************************
40-
Import the PublishProfiles
39+
Import the PublishProfile
4140
***********************************************************************************************
4241
-->
4342

44-
<PropertyGroup>
45-
<_PublishProfileRootFolder Condition="'$(_PublishProfileRootFolder)' == ''">$(MSBuildProjectDirectory)\$(AppDesignerFolder)\PublishProfiles\</_PublishProfileRootFolder>
46-
<PublishProfile Condition="'$(PublishProfile)' ==''">FileSystem</PublishProfile>
47-
<PublishProfileName Condition="'$(PublishProfileName)' == ''">$([System.IO.Path]::GetFileNameWithoutExtension($(PublishProfile)))</PublishProfileName>
48-
<PublishProfileFullPath Condition="'$(PublishProfileFullPath)' == ''">$(_PublishProfileRootFolder)$(PublishProfileName).pubxml</PublishProfileFullPath>
49-
<PublishProfileFullPath Condition="!Exists('$(PublishProfileFullPath)')">$(_PublishProfilesDir)$(PublishProfileName).pubxml</PublishProfileFullPath>
50-
51-
<!-- This is what get passed from the Visual Studio UI.-->
52-
<WebPublishProfileFile Condition="'$(WebPublishProfileFile)' == ''">$(PublishProfileFullPath)</WebPublishProfileFile>
53-
</PropertyGroup>
54-
55-
<Import Project="$(WebPublishProfileFile)" Condition="Exists('$(WebPublishProfileFile)')" />
56-
<Import Project="$(WebPublishProfileFile).user" Condition="Exists('$(WebPublishProfileFile).user')" />
43+
<Import Project="$(_PublishSdkDir)ImportPublishProfile.targets" Condition="Exists('ImportPublishProfile.targets') And '$(PublishProfileImported)' != 'true'" />
5744

5845
<!--
5946
***********************************************************************************************

‎src/Publish/Targets/netstandard1.0/PublishTargets/Microsoft.NET.Sdk.Publish.Docker.targets renamed to ‎src/Publish/Targets/PublishTargets/Microsoft.NET.Sdk.Publish.Docker.targets

File renamed without changes.

‎src/Publish/Targets/netstandard1.0/PublishTargets/Microsoft.NET.Sdk.Publish.FileSystem.targets renamed to ‎src/Publish/Targets/PublishTargets/Microsoft.NET.Sdk.Publish.FileSystem.targets

File renamed without changes.

‎src/Publish/Targets/netstandard1.0/PublishTargets/Microsoft.NET.Sdk.Publish.Kudu.targets renamed to ‎src/Publish/Targets/PublishTargets/Microsoft.NET.Sdk.Publish.Kudu.targets

File renamed without changes.

‎src/Publish/Targets/netstandard1.0/PublishTargets/Microsoft.NET.Sdk.Publish.MSDeploy.targets renamed to ‎src/Publish/Targets/PublishTargets/Microsoft.NET.Sdk.Publish.MSDeploy.targets

File renamed without changes.

‎src/Publish/Targets/netstandard1.0/PublishTargets/Microsoft.NET.Sdk.Publish.MSDeployPackage.targets renamed to ‎src/Publish/Targets/PublishTargets/Microsoft.NET.Sdk.Publish.MSDeployPackage.targets

File renamed without changes.

‎src/Publish/Targets/netstandard1.0/TransformTargets/Microsoft.NET.Sdk.Publish.TransformFiles.targets renamed to ‎src/Publish/Targets/TransformTargets/Microsoft.NET.Sdk.Publish.TransformFiles.targets

File renamed without changes.

‎src/Web/Package/Microsoft.NET.Sdk.Web.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
</PropertyGroup>
1313

1414
<ItemGroup>
15-
<Content Include="$(WebRoot)\Targets\netstandard1.0\**\*.*">
15+
<Content Include="$(WebRoot)\Targets\**\*.*">
1616
<Pack>true</Pack>
17-
<PackagePath>build\netstandard1.0</PackagePath>
17+
<PackagePath>targets</PackagePath>
1818
</Content>
1919

20-
<Content Include="$(WebRoot)\Targets\Sdk.*">
20+
<Content Include="$(WebRoot)\Sdk\**\*.*">
2121
<Pack>true</Pack>
2222
<PackagePath>Sdk</PackagePath>
2323
</Content>
@@ -29,8 +29,8 @@
2929
</ItemGroup>
3030

3131
<ItemGroup>
32-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Analyzers" Version="$(MicrosoftAspNetCoreMvcAnalyzers)" PrivateAssets="All" BundleAsAnalyzer="true" />
33-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Api.Analyzers" Version="$(MicrosoftAspNetCoreMvcApiAnalyzers)" PrivateAssets="All" BundleAsAnalyzer="true" />
32+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Analyzers" Version="$(MicrosoftAspNetCoreMvcAnalyzersPackageVersion)" PrivateAssets="All" BundleAsAnalyzer="true" />
33+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Api.Analyzers" Version="$(MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion)" PrivateAssets="All" BundleAsAnalyzer="true" />
3434
</ItemGroup>
3535

3636
<Target Name="_PackBundledAnalyzers" Inputs="@(PackageReference->HasMetadata('BundleAsAnalyzer'))" Outputs="%(PackageReference.Identity)" BeforeTargets="Build">

‎src/Web/Targets/Sdk.props renamed to ‎src/Web/Sdk/Sdk.props

File renamed without changes.

‎src/Web/Sdk/Sdk.targets

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<!--
2+
***********************************************************************************************
3+
Sdk.targets
4+
5+
WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
6+
created a backup copy. Incorrect changes to this file will make it
7+
impossible to load or build your projects from the command-line or the IDE.
8+
9+
Copyright (c) .NET Foundation. All rights reserved.
10+
***********************************************************************************************
11+
-->
12+
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
13+
14+
<PropertyGroup>
15+
<!--
16+
Configure the Razor SDK to add support for the MVC configuration unless the project configured it or the user opted out of the implicit reference to
17+
Microsoft.AspNetCore.App.
18+
-->
19+
<AddRazorSupportForMvc Condition="'$(DisableImplicitFrameworkReferences)' != 'true' And '$(AddRazorSupportForMvc)' != 'true'">true</AddRazorSupportForMvc>
20+
</PropertyGroup>
21+
22+
<!-- We can't add it here because the OutputPath and other msbuild properties are not evaluated.-->
23+
<!--<Import Sdk="Microsoft.NET.Sdk.Publish" Project="ImportPublishProfile.targets" />-->
24+
25+
<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
26+
27+
<Import Sdk="Microsoft.NET.Sdk.Razor" Project="Sdk.targets" />
28+
29+
<Import Sdk="Microsoft.NET.Sdk.Web.ProjectSystem" Project="Sdk.targets" />
30+
31+
<Import Sdk="Microsoft.NET.Sdk.Publish" Project="Sdk.targets" />
32+
33+
</Project>

‎src/Worker/Package/Microsoft.NET.Sdk.Worker.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<WorkerRoot Condition="'$(WorkerRoot)' == ''">$(RepoRoot)\src\Worker\</WorkerRoot>
@@ -12,12 +12,12 @@
1212
</PropertyGroup>
1313

1414
<ItemGroup>
15-
<Content Include="$(WorkerRoot)\Targets\netstandard1.0\**\*.*">
15+
<Content Include="$(WorkerRoot)\Targets\**\*.*">
1616
<Pack>true</Pack>
17-
<PackagePath>build\netstandard1.0</PackagePath>
17+
<PackagePath>targets</PackagePath>
1818
</Content>
1919

20-
<Content Include="$(WorkerRoot)\Targets\Sdk.*">
20+
<Content Include="$(WorkerRoot)\Sdk\**\*.*">
2121
<Pack>true</Pack>
2222
<PackagePath>Sdk</PackagePath>
2323
</Content>

‎src/Worker/Targets/Sdk.props renamed to ‎src/Worker/Sdk/Sdk.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Copyright (c) .NET Foundation. All rights reserved.
2424

2525
<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
2626

27-
<Import Project="$(MSBuildThisFileDirectory)..\build\netstandard1.0\Microsoft.NET.Sdk.Worker.props"
28-
Condition="Exists('$(MSBuildThisFileDirectory)..\build\netstandard1.0\Microsoft.NET.Sdk.Worker.props')" />
27+
<Import Project="$(MSBuildThisFileDirectory)..\targets\Microsoft.NET.Sdk.Worker.props"
28+
Condition="Exists('$(MSBuildThisFileDirectory)..\targets\Microsoft.NET.Sdk.Worker.props')" />
2929

3030
</Project>

‎src/Web/Targets/Sdk.targets renamed to ‎src/Worker/Sdk/Sdk.targets

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,7 @@ Copyright (c) .NET Foundation. All rights reserved.
1313

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

16-
<Import Sdk="Microsoft.NET.Sdk.Razor" Project="Sdk.targets" />
17-
18-
<Import Sdk="Microsoft.NET.Sdk.Web.ProjectSystem" Project="Sdk.targets" />
19-
20-
<Import Sdk="Microsoft.NET.Sdk.Publish" Project="Sdk.targets" />
16+
<Import Project="$(MSBuildThisFileDirectory)..\targets\Microsoft.NET.Sdk.Worker.targets"
17+
Condition="Exists('$(MSBuildThisFileDirectory)..\targets\Microsoft.NET.Sdk.Worker.targets')" />
2118

2219
</Project>

‎src/Worker/Targets/netstandard1.0/Microsoft.NET.Sdk.Worker.props renamed to ‎src/Worker/Targets/Microsoft.NET.Sdk.Worker.props

File renamed without changes.

‎src/Worker/Targets/netstandard1.0/Microsoft.NET.Sdk.Worker.targets renamed to ‎src/Worker/Targets/Microsoft.NET.Sdk.Worker.targets

File renamed without changes.

‎src/Worker/Targets/Sdk.targets

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)