Skip to content

Commit 1b9a6b0

Browse files
author
Nate McMaster
committed
Replace PackNuspec with a dummy .csproj file
1 parent 0588b13 commit 1b9a6b0

File tree

3 files changed

+38
-33
lines changed

3 files changed

+38
-33
lines changed

build/SharedFx.targets

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -402,26 +402,19 @@
402402
<SymbolsPackageId>runtime.$(SharedFxRID).$(SymbolsNuspecIdSuffix)</SymbolsPackageId>
403403
</PropertyGroup>
404404

405-
<ItemGroup>
406-
<_SymbolFiles Include="$(SymbolsWorkDir)**\*.pdb;$(SymbolsWorkDir)**\*.map;$(SymbolsWorkDir)**\*.dll" />
407-
<SymbolFiles Include="@(_SymbolFiles)">
408-
<PackagePath>%(RecursiveDir)%(Filename)%(Extension)</PackagePath>
409-
</SymbolFiles>
410-
</ItemGroup>
411-
412405
<!-- Create Layout -->
413406
<Copy
414-
SourceFiles="$(_TemplatesDir)SharedFxSymbols\SharedFrameworkSymbols.nuspec"
415-
DestinationFiles="$(SymbolsWorkDir)$(SymbolsPackageId).nuspec"
407+
SourceFiles="$(_TemplatesDir)SharedFxSymbols\SharedFrameworkSymbols.csproj"
408+
DestinationFiles="$(SymbolsWorkDir)$(SymbolsPackageId).csproj"
416409
OverwriteReadOnlyFiles="True" />
417410

418411
<!-- Produce symbols nupkg -->
419-
<PackNuspec NuspecPath="$(SymbolsWorkDir)$(SymbolsPackageId).nuspec"
420-
OutputPath="$([MSBuild]::NormalizeDirectory($(ArtifactsDir)))symbols\$(SymbolsPackageId).$(PackageVersion).symbols.nupkg"
421-
Properties="version=$(PackageVersion);id=$(SymbolsPackageId);description=$(Description);Configuration=$(Configuration)"
422-
Overwrite="true"
423-
PackageFiles="@(SymbolFiles)"
424-
BasePath="$(SymbolsWorkDir)" />
412+
<MSBuild Projects="$(SymbolsWorkDir)$(SymbolsPackageId).csproj"
413+
Targets="Restore;Pack"
414+
Properties="SymbolsWorkDir=$(SymbolsWorkDir);PackageId=$(SymbolsPackageId);PackageVersion=$(PackageVersion);PackageOutputPath=$(IntermediateDir);PackageDescription=$(Description)" />
415+
<Copy
416+
SourceFiles="$(IntermediateDir)$(SymbolsPackageId).$(PackageVersion).symbols.nupkg"
417+
DestinationFolder="$([MSBuild]::NormalizeDirectory($(ArtifactsDir)))symbols\" />
425418
</Target>
426419

427420
<Target Name="PackSharedFx" DependsOnTargets="DefineSharedFxPrerequisites" >
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<Project>
2+
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
3+
4+
<PropertyGroup>
5+
<TargetFramework>netcoreapp2.1</TargetFramework>
6+
<Authors>Microsoft</Authors>
7+
<Copyright>Copyright © Microsoft Corporation</Copyright>
8+
<PackageLicenseUrl>https://raw.githubusercontent.com/aspnet/Home/2.0.0/LICENSE.txt</PackageLicenseUrl>
9+
<PackageIconUrl>https://go.microsoft.com/fwlink/?LinkID=288859</PackageIconUrl>
10+
<PackageProjectUrl>https://asp.net</PackageProjectUrl>
11+
<IncludeSymbols>true</IncludeSymbols>
12+
<IncludeBuildOutput>false</IncludeBuildOutput>
13+
<PackageTags>aspnetcore</PackageTags>
14+
<ContentTargetFolders></ContentTargetFolders>
15+
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
16+
</PropertyGroup>
17+
18+
<ItemGroup>
19+
<_SymbolFiles Include="$(SymbolsWorkDir)**\*.pdb;$(SymbolsWorkDir)**\*.map;$(SymbolsWorkDir)**\*.dll" />
20+
<Content Include="@(_SymbolFiles)">
21+
<PackagePath>%(RecursiveDir)%(Filename)%(Extension)</PackagePath>
22+
</Content>
23+
</ItemGroup>
24+
25+
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
26+
27+
<Target Name="Compile" />
28+
<Target Name="CopyFilesToOutputDirectory" />
29+
30+
</Project>

build/tools/templates/SharedFxSymbols/SharedFrameworkSymbols.nuspec

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

0 commit comments

Comments
 (0)