Skip to content

Commit e1c4d15

Browse files
author
John Luo
committed
Merge fix
1 parent 17b6ce8 commit e1c4d15

File tree

8 files changed

+61
-50
lines changed

8 files changed

+61
-50
lines changed

‎build/AzureIntegration.targets

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<Project>
2+
<PropertyGroup>
3+
<AzureIntegrationProjectRoot>$(MSBuildThisFileDirectory)..\src\AzureIntegration\</AzureIntegrationProjectRoot>
4+
</PropertyGroup>
5+
6+
<Target Name="BuildAzureIntegration" DependsOnTargets="PrepareOutputPaths;GeneratePropsFiles">
7+
<PropertyGroup>
8+
<AzureIntegrationProjProperties>
9+
AspNetUniverseBuildOffline=true;
10+
RepositoryRoot=$(AzureIntegrationProjectRoot);
11+
DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcesPropsPath);
12+
DotNetPackageVersionPropsPath=$(GeneratedPackageVersionPropsPath);
13+
VersionSuffix=$(VersionSuffix);
14+
BuildNumberSuffix=$(BuildNumberSuffix);
15+
Configuration=$(Configuration);
16+
IsFinalBuild=$(IsFinalBuild);
17+
</AzureIntegrationProjProperties>
18+
</PropertyGroup>
19+
20+
<MSBuild Projects="$(MSBuildProjectFullPath)"
21+
Targets="$(AzureIntegrationProjectTargets)"
22+
Properties="$(AzureIntegrationProjProperties)" />
23+
24+
<ItemGroup>
25+
<AzureIntegrationArtifacts Include="$(AzureIntegrationProjectRoot)artifacts\build\*" />
26+
</ItemGroup>
27+
28+
<Copy SourceFiles="@(AzureIntegrationArtifacts)" DestinationFolder="$(ProductPackageOutputPath)" />
29+
</Target>
30+
31+
</Project>

‎build/SharedFx.targets

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -44,28 +44,6 @@
4444

4545
</Target>
4646

47-
<Target Name="BuildSiteExtension" DependsOnTargets="BuildMetapackages" Condition="'$(BuildSiteExtension)' == 'true'" >
48-
<PropertyGroup>
49-
<AzureIntegrationProjProperties>
50-
AspNetUniverseBuildOffline=true;
51-
DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcesPropsPath);
52-
DotNetPackageVersionPropsPath=$(GeneratedPackageVersionPropsPath);
53-
BuildNumber=$(BuildNumber);
54-
Configuration=$(Configuration);
55-
IsFinalBuild=$(IsFinalBuild);
56-
</AzureIntegrationProjProperties>
57-
</PropertyGroup>
58-
59-
<!-- Pack logging site extension -->
60-
<MSBuild Projects="$(RepositoryRoot)\src\SiteExtensions\LoggingBranch\LoggingBranch.csproj" Targets="Restore;Pack" Properties="$(AzureIntegrationProjProperties);PackageOutputPath=$(BuildDir)" />
61-
</Target>
62-
63-
<Target Name="GetSiteExtensionArtifactInfo" Condition="'$(BuildSiteExtension)' == 'true'" >
64-
<MSBuild Projects="$(RepositoryRoot)\src\SiteExtensions\LoggingBranch\LoggingBranch.csproj" Targets="GetArtifactInfo" Properties="PackageOutputPath=$(BuildDir);BuildNumber=$(BuildNumber);DesignTimeBuild=true;IsFinalBuild=$(IsFinalBuild)">
65-
<Output TaskParameter="TargetOutputs" ItemName="ArtifactInfo" />
66-
</MSBuild>
67-
</Target>
68-
6947
<Target Name="_BuildSharedFxProjects" DependsOnTargets="GeneratePropsFiles;ResolveCommitHash">
7048

7149
<PropertyGroup>

‎build/artifacts.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ This can be done once #4246 is complete, and done in conjunction with converting
2828
<PackageArtifact Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Category="ship" />
2929
<PackageArtifact Include="Microsoft.AspNetCore.Authentication.Twitter" Category="ship" />
3030
<PackageArtifact Include="Microsoft.AspNetCore.Authentication.WsFederation" Category="ship" />
31-
<PackageArtifact Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension.3.0" Category="noship" Condition="'$(BuildSiteExtension)' == 'true'" />
3231
<PackageArtifact Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Category="ship" />
3332
<PackageArtifact Include="Microsoft.AspNetCore.AzureAppServicesIntegration" Category="ship" />
3433
<PackageArtifact Include="Microsoft.AspNetCore.Blazor" Category="ship" />

‎build/repo.props

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@
2525
<DisableSignCheckStrongName>true</DisableSignCheckStrongName>
2626

2727
<SharedSourcesFolder>$(RepositoryRoot)src\Shared\</SharedSourcesFolder>
28-
<SharedFxArchitecture Condition="'$(SharedFxArchitecture)' == ''">$(SharedFxRid.Substring($([MSBuild]::Add($(SharedFxRid.LastIndexOf('-')), 1))))</SharedFxArchitecture>
29-
<BuildSiteExtension>false</BuildSiteExtension>
30-
<BuildSiteExtension Condition="'$(BuildSiteExtension)' == 'true' AND '$(OS)' != 'Windows_NT'">false</BuildSiteExtension>
3128
</PropertyGroup>
3229

3330
<PropertyGroup Condition=" '$(BuildAllProjects)' == 'true' ">

‎build/repo.targets

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<Project>
22
<Import Project="RepositoryBuild.targets" />
3+
<Import Project="AzureIntegration.targets" />
34
<Import Project="SharedFx.targets" />
45
<Import Project="CodeSign.targets" />
56
<Import Project="Publish.targets" />
@@ -35,7 +36,7 @@
3536
<CompileDependsOn Condition=" '$(BuildAllProjects)' == 'true' ">$(CompileDependsOn);PackProjects;BuildRepositories;BuildSharedFx</CompileDependsOn>
3637

3738
<PackageDependsOn>$(PackageDependsOn);PackProjects</PackageDependsOn>
38-
<PackageDependsOn Condition=" '$(BuildAllProjects)' == 'true' ">$(PackageDependsOn);BuildSiteExtension;RemoveSharedFrameworkOnlyRefsFromNuspec</PackageDependsOn>
39+
<PackageDependsOn Condition=" '$(BuildAllProjects)' == 'true' ">$(PackageDependsOn);RemoveSharedFrameworkOnlyRefsFromNuspec</PackageDependsOn>
3940

4041
<TestDependsOn />
4142
<TestDependsOn Condition=" '$(_RunBuild)' == 'true' ">$(TestDependsOn);Compile</TestDependsOn>
@@ -92,7 +93,7 @@
9293
</ItemGroup>
9394
</Target>
9495

95-
<Target Name="ResolveRepoInfo" DependsOnTargets="_ResolveProjectArtifactsInfoShipped;_PrepareRepositories;GetSiteExtensionArtifactInfo">
96+
<Target Name="ResolveRepoInfo" DependsOnTargets="_ResolveProjectArtifactsInfoShipped;_PrepareRepositories">
9697
<!-- We need to pass the NETCoreApp package versions to msbuild so that it doesn't complain about us using a different one than it was restored against. -->
9798
<PropertyGroup>
9899
<DesignTimeBuildProps>$(BuildProperties);MicrosoftNETCoreAppPackageVersion=$(MicrosoftNETCoreAppPackageVersion);</DesignTimeBuildProps>

‎src/Security/Security.sln

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,12 +131,11 @@ EndProject
131131
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Diagnostics.Abstractions", "..\Middleware\Diagnostics.Abstractions\src\Microsoft.AspNetCore.Diagnostics.Abstractions.csproj", "{73BCF909-4999-4663-BAE1-36B7734212B7}"
132132
EndProject
133133
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Routing", "..\Http\Routing\src\Microsoft.AspNetCore.Routing.csproj", "{5B2F3890-198E-4BE8-8464-10B4D97F976A}"
134+
EndProject
134135
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Routing.Abstractions", "..\Http\Routing.Abstractions\src\Microsoft.AspNetCore.Routing.Abstractions.csproj", "{71961A8D-B26F-46AE-A475-D00425D875A0}"
135136
EndProject
136137
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "..\Servers\IIS\IISIntegration\src\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{FD3AB895-2AF6-447D-82CF-DB002B491D23}"
137138
EndProject
138-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "..\Servers\IIS\IISIntegration\src\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{81D0E81F-4711-4C7B-BBD4-E168102D0D7D}"
139-
EndProject
140139
Global
141140
GlobalSection(SolutionConfigurationPlatforms) = preSolution
142141
Debug|Any CPU = Debug|Any CPU

‎src/SiteExtensions/LoggingBranch/LoggingBranch.csproj

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

33
<PropertyGroup>
4-
<TrimmedVersion>$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion)</TrimmedVersion>
4+
<TrimmedVersion>$(VersionPrefix.Substring(0, $(VersionPrefix.LastIndexOf('.'))))</TrimmedVersion>
55
<title>ASP.NET Core Extensions</title>
66
<Description>This extension enables additional functionality for ASP.NET Core on Azure WebSites, such as enabling Azure logging.</Description>
77
<TargetFramework>net461</TargetFramework>
88
<GenerateDocumentationFile>false</GenerateDocumentationFile>
99
<PackageTags>aspnet;logging;aspnetcore;AzureSiteExtension;keyvault;configuration;dataprotection</PackageTags>
1010
<ContentTargetFolders>content</ContentTargetFolders>
11-
<PackageId>Microsoft.AspNetCore.AzureAppServices.SiteExtension.$(TrimmedVersion)</PackageId>
11+
<PackageId>Microsoft.AspNetCore.AzureAppServices.SiteExtension.$(TrimmedVersion).$(SharedFxArchitecture)</PackageId>
1212
<MicrosoftAspNetCoreAppPackageVersion>$(PackageVersion)</MicrosoftAspNetCoreAppPackageVersion>
1313
<HostingStartupRuntimeFrameworkVersion>$(MicrosoftNETCoreAppPackageVersion)</HostingStartupRuntimeFrameworkVersion>
1414

@@ -20,7 +20,6 @@
2020
<IncludeSymbols>false</IncludeSymbols>
2121
<IncludeSource>false</IncludeSource>
2222
<ContentTargetFolders>content</ContentTargetFolders>
23-
<IsPackageInThisPatch>true</IsPackageInThisPatch>
2423
</PropertyGroup>
2524

2625
<ItemGroup>
@@ -29,6 +28,18 @@
2928
<HostingStartupPackageReference Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="$(PackageVersion)" />
3029

3130
<PackageReference Include="Internal.AspNetCore.Sdk" PrivateAssets="All" Version="$(InternalAspNetCoreSdkPackageVersion)" />
31+
32+
<ProjectReference Include="..\..\Framework\pkg\Microsoft.AspNetCore.App.pkgproj">
33+
<Targets>Pack</Targets>
34+
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
35+
<SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
36+
</ProjectReference>
37+
38+
<ProjectReference Include="..\..\Framework\src\Microsoft.AspNetCore.App.shfxproj">
39+
<Targets>Pack</Targets>
40+
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
41+
<SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
42+
</ProjectReference>
3243
</ItemGroup>
3344

3445
</Project>

‎src/SiteExtensions/Sdk/SiteExtension.targets

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,17 @@
99

1010
<PropertyGroup>
1111
<_TemplatesDirectory>$(MSBuildThisFileDirectory)..\content\</_TemplatesDirectory>
12-
<_DepsOutputDirectory>$(RepositoryRoot).w\se\</_DepsOutputDirectory>
12+
<_DepsOutputDirectory>$(IntermediateOutputPath)\se\</_DepsOutputDirectory>
1313
<_WorkingDirectory>$(_DepsOutputDirectory)\depswork</_WorkingDirectory>
1414
<_BasePackagePath>content\additionaldeps\</_BasePackagePath>
1515
<_RuntimeStoreManifestFile>$(_DepsOutputDirectory)\rs.csproj</_RuntimeStoreManifestFile>
1616
<_RuntimeStoreOutput>$(_DepsOutputDirectory)\rs\</_RuntimeStoreOutput>
1717
<ManifestFileContents>
1818
<![CDATA[
1919
<Project Sdk="Microsoft.NET.Sdk">
20+
<PropertyGroup>
21+
<TargetFramework>netcoreapp3.0</TargetFramework>
22+
</PropertyGroup>
2023
<ItemGroup>
2124
<PackageReference Remove="Internal.AspNetCore.Sdk" />
2225
<PackageReference Include="Microsoft.AspNetCore.App" Version="$(MicrosoftAspNetCoreAppPackageVersion)" IsImplicitlyDefined="true"/>
@@ -27,6 +30,11 @@
2730
</ManifestFileContents>
2831
</PropertyGroup>
2932

33+
<ItemGroup Condition="'@(HostingStartupRuntimeStoreTargets->Count())' == '0'">
34+
<HostingStartupRuntimeStoreTargets Include="netcoreapp3.0" Runtime="win7-x64" />
35+
<HostingStartupRuntimeStoreTargets Include="netcoreapp3.0" Runtime="win7-x86" />
36+
</ItemGroup>
37+
3038
<ItemGroup>
3139
<_TemplateFiles Include="$(MSBuildThisFileDirectory)\HostingStartup\*.cs*" />
3240
<_HostingStartupPackageReference
@@ -45,34 +53,21 @@
4553
<!-- Generate runtime store -->
4654
<WriteLinesToFile File="$(_RuntimeStoreManifestFile)" Lines="$(ManifestFileContents)" Overwrite="true" Encoding="Unicode"/>
4755

48-
<PropertyGroup>
49-
<_CommonProperties>
50-
AspNetUniverseBuildOffline=true;
51-
DotNetRestoreSourcePropsPath=$(DotNetRestoreSourcePropsPath);
52-
DotNetPackageVersionPropsPath=$(DotNetPackageVersionPropsPath);
53-
BuildNumber=$(BuildNumber);
54-
Configuration=$(Configuration);
55-
IsFinalBuild=$(IsFinalBuild);
56-
MicrosoftAspNetCoreAppPackageVersion=$(MicrosoftAspNetCoreAppPackageVersion);
57-
RuntimeFrameworkVersion=$(HostingStartupRuntimeFrameworkVersion);
58-
</_CommonProperties>
59-
</PropertyGroup>
60-
6156
<MSBuild Projects="$(_RuntimeStoreManifestFile)"
6257
Targets="ComposeStore"
63-
Properties="TargetFramework=%(HostingStartupRuntimeStoreTargets.Identity);RuntimeIdentifier=%(HostingStartupRuntimeStoreTargets.Runtime);ComposeDir=$(_RuntimeStoreOutput)\%(HostingStartupRuntimeStoreTargets.Runtime);SkipOptimization=true;$(_CommonProperties)" />
58+
Properties="TargetFramework=%(HostingStartupRuntimeStoreTargets.Identity);RuntimeFrameworkVersion=$(HostingStartupRuntimeFrameworkVersion);RuntimeIdentifier=%(HostingStartupRuntimeStoreTargets.Runtime);ComposeDir=$(_RuntimeStoreOutput)\%(HostingStartupRuntimeStoreTargets.Runtime);SkipOptimization=true" />
6459
<!-- Generate deps -->
6560
<RemoveDir Directories="%(_HostingStartupPackageReference.WorkingDirectory)" />
6661

6762
<Copy SourceFiles="@(_TemplateFiles)" DestinationFolder="%(_HostingStartupPackageReference.WorkingDirectory)" />
6863

6964
<MSBuild Projects="%(_HostingStartupPackageReference.Project)"
7065
Targets="Restore"
71-
Properties="HostingStartupPackageName=%(_HostingStartupPackageReference.Identity);HostingStartupPackageVersion=%(_HostingStartupPackageReference.Version);UseAppHost=false;NoBuild=false;$(_CommonProperties)" />
66+
Properties="HostingStartupPackageName=%(_HostingStartupPackageReference.Identity);HostingStartupPackageVersion=%(_HostingStartupPackageReference.Version);RuntimeFrameworkVersion=$(HostingStartupRuntimeFrameworkVersion);MicrosoftAspNetCoreAppPackageVersion=$(MicrosoftAspNetCoreAppPackageVersion);UseAppHost=false;NoBuild=false" />
7267

7368
<MSBuild Projects="%(_HostingStartupPackageReference.Project)"
7469
Targets="Publish"
75-
Properties="PublishDir=%(_HostingStartupPackageReference.WorkingDirectory)\p;HostingStartupPackageName=%(_HostingStartupPackageReference.Identity);HostingStartupPackageVersion=%(_HostingStartupPackageReference.Version);UseAppHost=false;NoBuild=false;IncludeMainProjectInDepsFile=false;$(_CommonProperties)" />
70+
Properties="PublishDir=%(_HostingStartupPackageReference.WorkingDirectory)\p;HostingStartupPackageName=%(_HostingStartupPackageReference.Identity);HostingStartupPackageVersion=%(_HostingStartupPackageReference.Version);RuntimeFrameworkVersion=$(HostingStartupRuntimeFrameworkVersion);MicrosoftAspNetCoreAppPackageVersion=$(MicrosoftAspNetCoreAppPackageVersion);UseAppHost=false;NoBuild=false;IncludeMainProjectInDepsFile=false" />
7671
<Copy SourceFiles="%(_HostingStartupPackageReference.DepsFile)" DestinationFiles="%(_HostingStartupPackageReference.TrimmedDepsFile)" />
7772

7873
<ItemGroup>

0 commit comments

Comments
 (0)