Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
14 changes: 9 additions & 5 deletions aspnetcore/Directory.Build.BeforeCommonTargets.targets
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,27 @@
<!-- Only build Microsoft.AspNetCore.App, Microsoft.AspNetCore.App.Ref, ref/ assemblies, and ProjectTemplates in source build. -->
<!-- Analyzer package are needed in source build for WebSDK -->
<ExcludeFromSourceBuild
Condition="'$(ExcludeFromSourceBuild)' == '' and
Condition="'$(ExcludeFromSourceBuild)' == '' and
'$(DotNetBuildFromSource)' == 'true' and
'$(IsAspNetCoreApp)' != 'true' and
'$(MSBuildProjectName)' != '$(TargetingPackName)' and
'$(IsAnalyzersProject)' != 'true' and
'$(IsProjectTemplateProject)' != 'true'">true</ExcludeFromSourceBuild>

'$(IsProjectTemplateProject)' != 'true'"
>true</ExcludeFromSourceBuild
>
<!-- If the user has specified that they want to skip building any test related projects with SkipTestBuild,
suppress all targets for TestProjects using ExcludeFromBuild. -->
<ExcludeFromBuild Condition="'$(IsPackable)' != 'true' and
<ExcludeFromBuild
Condition="'$(IsPackable)' != 'true' and
'$(SkipTestBuild)' == 'true' and
($(IsTestProject) or
'$(IsPublishedAppTestProject)' == 'true' or
'$(IsTestAssetProject)' == 'true' or
'$(IsBenchmarkProject)' == 'true' or
'$(IsSampleProject)' == 'true' or
'$(IsSpecificationTestProject)' == 'true' or
'$(IsMicrobenchmarksProject)' == 'true')">true</ExcludeFromBuild>
'$(IsMicrobenchmarksProject)' == 'true')"
>true</ExcludeFromBuild
>
</PropertyGroup>
</Project>
193 changes: 112 additions & 81 deletions aspnetcore/Directory.Build.props

Large diffs are not rendered by default.

230 changes: 146 additions & 84 deletions aspnetcore/Directory.Build.targets

Large diffs are not rendered by default.

65 changes: 52 additions & 13 deletions aspnetcore/NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,60 @@
<configuration>
<packageSources>
<clear />
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
<add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
<add key="dotnet9-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9-transport/nuget/v3/index.json" />
<add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
<add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
<add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
<add
key="dotnet-eng"
value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json"
/>
<add
key="dotnet-tools"
value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json"
/>
<add
key="dotnet9"
value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json"
/>
<add
key="dotnet9-transport"
value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9-transport/nuget/v3/index.json"
/>
<add
key="dotnet8"
value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json"
/>
<add
key="dotnet7"
value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json"
/>
<add
key="dotnet8-transport"
value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json"
/>
<add
key="dotnet-public"
value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json"
/>
<!-- Used for the SiteExtension bits that are included in the 8.0 build -->
<add key="dotnet31-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json" />
<add key="dotnet5-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json" />
<add key="dotnet6-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-transport/nuget/v3/index.json" />
<add key="dotnet7-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7-transport/nuget/v3/index.json" />
<add
key="dotnet31-transport"
value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json"
/>
<add
key="dotnet5-transport"
value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json"
/>
<add
key="dotnet6-transport"
value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-transport/nuget/v3/index.json"
/>
<add
key="dotnet7-transport"
value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7-transport/nuget/v3/index.json"
/>
<!-- Used for the Rich Navigation indexing task -->
<add key="richnav" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" />
<add
key="richnav"
value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json"
/>
</packageSources>
<disabledPackageSources>
<clear />
Expand Down
28 changes: 16 additions & 12 deletions aspnetcore/eng/AfterSigning.targets
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,31 @@
<InstallersOutputPath>$(ArtifactsDir)installers\</InstallersOutputPath>
<_SuppressSdkImports>false</_SuppressSdkImports>
</PropertyGroup>

<Target Name="PopulateGenerateChecksumItems"
Condition="'$(GenerateChecksums)' == 'true'"
AfterTargets="Build"
BeforeTargets="GenerateChecksums" >

<Target
Name="PopulateGenerateChecksumItems"
Condition="'$(GenerateChecksums)' == 'true'"
AfterTargets="Build"
BeforeTargets="GenerateChecksums"
>
<ItemGroup>
<InstallerFiles Include="$(InstallersOutputPath)**\*.msi" />
<InstallerFiles Include="$(InstallersOutputPath)**\*.exe" />
<InstallerFiles Include="$(InstallersOutputPath)**\*.zip" Exclude="$(InstallersOutputPath)**\*.wixpack.zip" />
<InstallerFiles
Include="$(InstallersOutputPath)**\*.zip"
Exclude="$(InstallersOutputPath)**\*.wixpack.zip"
/>
<InstallerFiles Include="$(InstallersOutputPath)**\*.tar.gz" />
<InstallerFiles Include="$(InstallersOutputPath)**\*.wixlib" />
<InstallerFiles Include="$(InstallersOutputPath)**\*.deb" />
<InstallerFiles Include="$(InstallersOutputPath)**\*.rpm" />
<GenerateChecksumItems Include="%(InstallerFiles.Identity)" >
<GenerateChecksumItems Include="%(InstallerFiles.Identity)">
<DestinationPath>%(FullPath).sha512</DestinationPath>
</GenerateChecksumItems>
</ItemGroup>

</Target>

<Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" Condition="'$(GenerateChecksums)' == 'true'" />

<Import
Project="Sdk.targets"
Sdk="Microsoft.DotNet.Arcade.Sdk"
Condition="'$(GenerateChecksums)' == 'true'"
/>
</Project>
23 changes: 13 additions & 10 deletions aspnetcore/eng/AfterSolutionBuild.targets
Original file line number Diff line number Diff line change
@@ -1,21 +1,24 @@
<Project>

<Import Project="tools\RepoTasks\RepoTasks.tasks" />
<Import Project="SharedFramework.External.props" />
<Import Project="SharedFramework.Local.props" />

<!-- This is temporary until we can use FrameworkReference to build our own packages. -->
<Target Name="RemoveSharedFrameworkOnlyRefsFromNuspec" AfterTargets="Pack"
Condition=" '$(MSBuildRuntimeType)' == 'core' ">
<Target
Name="RemoveSharedFrameworkOnlyRefsFromNuspec"
AfterTargets="Pack"
Condition=" '$(MSBuildRuntimeType)' == 'core' "
>
<ItemGroup>
<_BuildOutput Include="$(ArtifactsShippingPackagesDir)*.nupkg"
Exclude="$(ArtifactsShippingPackagesDir)*.symbols.nupkg" />
<_BuildOutput
Include="$(ArtifactsShippingPackagesDir)*.nupkg"
Exclude="$(ArtifactsShippingPackagesDir)*.symbols.nupkg"
/>
</ItemGroup>

<RepoTasks.RemoveSharedFrameworkDependencies Condition="'@(_BuildOutput->Count())' != '0'"
<RepoTasks.RemoveSharedFrameworkDependencies
Condition="'@(_BuildOutput->Count())' != '0'"
Files="@(_BuildOutput)"
FrameworkOnlyPackages="@(AspNetCoreAppReference)"
SharedFrameworkTargetFramework="$(DefaultNetCoreTargetFramework)" />
SharedFrameworkTargetFramework="$(DefaultNetCoreTargetFramework)"
/>
</Target>

</Project>
2 changes: 1 addition & 1 deletion aspnetcore/eng/Baseline.xml
Original file line number Diff line number Diff line change
Expand Up @@ -110,4 +110,4 @@ Update this list when preparing for a new patch.
<Package Id="Microsoft.JSInterop" Version="8.0.0" />
<Package Id="Microsoft.JSInterop.WebAssembly" Version="8.0.0" />
<Package Id="Microsoft.Net.Http.Headers" Version="8.0.0" />
</Baseline>
</Baseline>
Loading