Skip to content
Merged
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/build.proj
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<TestAssemblies Include="$(OutputDir)*.Tests.dll;$(OutputDir)*.Test.dll;$(OutputDir)*.UnitTest.dll" />
</ItemGroup>
<Message Condition="'$(Configuration)' == 'Debug'" Importance="high" Text="net452: Testing %(TestAssemblies.Filename)" />
<Exec Condition="'$(Configuration)' == 'Debug'" Command="$(xUnitRunner) @(TestAssemblies, ' ') -trait $(TestFilter) -html $(TestOutput)"/>
<Exec Condition="'$(Configuration)' == 'Debug'" Command="$(xUnitRunner) @(TestAssemblies, ' ') -trait $(TestFilter) -html $(TestOutput)" />
</Target>

<Target Name="netstandard20">
Expand Down
18 changes: 9 additions & 9 deletions build/pack.proj
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,17 @@
</PropertyGroup>

<ItemGroup>
<Net452Projects Include="$(Src)**\*.csproj" Exclude="$(Src)**\*.Netcore.csproj;$(Src)**\*.Tests.csproj;$(Src)**\*.Test.csproj;$(Src)**\*.UnitTest.csproj"/>
<Net452Projects Include="$(Src)**\*.csproj" Exclude="$(Src)**\*.Netcore.csproj;$(Src)**\*.Tests.csproj;$(Src)**\*.Test.csproj;$(Src)**\*.UnitTest.csproj" />
</ItemGroup>
<Exec Command="$(NuGet) pack %(Net452Projects.FullPath) -OutputDirectory $(Net452PackDir) -Properties Configuration=$(Configuration) -Version $(PackageVersion)-preview -IncludeReferencedProjects"/>
<Exec Command="$(NuGet) pack %(Net452Projects.FullPath) -OutputDirectory $(Net452PackDir) -Properties Configuration=$(Configuration) -Version $(PackageVersion)-preview -IncludeReferencedProjects" />
</Target>

<Target Name="netstandard20">
<Message Importance="high" Text="Pack: netstandard20 started" />
<ItemGroup>
<NetStandard20Projects Include="$(Src)**\*.Netcore.csproj" Exclude="$(Src)**\*.Tests.Netcore.csproj;$(Src)**\*.Test.Netcore.csproj;$(Src)**\*.UnitTest.Netcore.csproj"/>
<NetStandard20Projects Include="$(Src)**\*.Netcore.csproj" Exclude="$(Src)**\*.Tests.Netcore.csproj;$(Src)**\*.Test.Netcore.csproj;$(Src)**\*.UnitTest.Netcore.csproj" />
</ItemGroup>
<Exec Command="dotnet pack %(NetStandard20Projects.FullPath) -c $(Configuration) /p:PackageVersion=$(PackageVersion)-preview --no-build"/>
<Exec Command="dotnet pack %(NetStandard20Projects.FullPath) -c $(Configuration) /p:PackageVersion=$(PackageVersion)-preview --no-build" />
</Target>

<Target Name="All" DependsOnTargets="net452;netstandard20">
Expand All @@ -39,23 +39,23 @@

<!-- https://philcupp.wordpress.com/2009/10/12/msbuild-tricks-i-don%E2%80%99t-want-to-forget/ -->
<ItemGroup>
<Net452Paths Include="$(Net452PackDir)*.nupkg"/>
<NetStandard20Paths Include="$(NetStandard20PackDir)*.nupkg"/>
<Net452Paths Include="$(Net452PackDir)*.nupkg" />
<NetStandard20Paths Include="$(NetStandard20PackDir)*.nupkg" />
</ItemGroup>

<!-- https://stackoverflow.com/a/2012178/294804 -->
<CreateItem Include="@(Net452Paths->'%(Filename)%(Extension)')" AdditionalMetadata="TargetPath=%(FullPath)">
<Output TaskParameter="Include" ItemName="Net452Packages"/>
<Output TaskParameter="Include" ItemName="Net452Packages" />
</CreateItem>
<CreateItem Include="@(NetStandard20Paths->'%(Filename)%(Extension)')" AdditionalMetadata="TargetPath=%(FullPath)">
<Output TaskParameter="Include" ItemName="NetStandard20Packages"/>
<Output TaskParameter="Include" ItemName="NetStandard20Packages" />
</CreateItem>

<ItemGroup>
<Packs Include="@(NetStandard20Packages)" Condition=" '@(Net452Packages)' == '@(NetStandard20Packages)' and %(Identity) != '' " />
</ItemGroup>

<Exec Command="$(NupkgMerge) -P %(Packs.TargetPath) -S $(Net452PackDir)@(Packs) -O %(Packs.TargetPath)"/>
<Exec Command="$(NupkgMerge) -P %(Packs.TargetPath) -S $(Net452PackDir)@(Packs) -O %(Packs.TargetPath)" />

<ItemGroup>
<Net452OnlyPackages Include="$(Net452PackDir)Microsoft.Azure.PowerShell.ScenarioTest.*.nupkg;$(Net452PackDir)Microsoft.Azure.PowerShell.ServiceManagement.*.nupkg" Exclude="$(Net452PackDir)Microsoft.Azure.PowerShell.ScenarioTest.ResourceManager.*.nupkg" />
Expand Down
23 changes: 23 additions & 0 deletions build/publish.proj
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="All" InitialTargets="CheckApiKey" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Root>$(MSBuildThisFileDirectory)..\</Root>
<Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
<Artifacts>$(Root)artifacts\</Artifacts>
<Tools>$(Root)tools\</Tools>
<NuGet>$(Tools)NuGet-4.7.0\nuget.exe</NuGet>
<PackDir>$(Artifacts)Package\$(Configuration)\</PackDir>
</PropertyGroup>

<Target Name="CheckApiKey">
<Error Text="ApiKey is not assigned a value!" Condition="'$(ApiKey)' == ''" />
</Target>

<Target Name="All">
<Message Importance="high" Text="Publish: All started" />
<ItemGroup>
<PackagePaths Include="$(PackDir)*.nupkg" />
</ItemGroup>
<Exec Command="$(NuGet) push %(PackagePaths.FullPath) -ApiKey $(ApiKey) -Source https://www.myget.org/F/azure-powershell/api/v2/package" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about tagging the repo?

</Target>
</Project>