Skip to content

Commit 1ca4022

Browse files
authored
Merge pull request #44 from Azure/publish-process
Publish process
2 parents 0fff31c + fc83fee commit 1ca4022

File tree

3 files changed

+33
-10
lines changed

3 files changed

+33
-10
lines changed

build/build.proj

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<TestAssemblies Include="$(OutputDir)*.Tests.dll;$(OutputDir)*.Test.dll;$(OutputDir)*.UnitTest.dll" />
3434
</ItemGroup>
3535
<Message Condition="'$(Configuration)' == 'Debug'" Importance="high" Text="net452: Testing %(TestAssemblies.Filename)" />
36-
<Exec Condition="'$(Configuration)' == 'Debug'" Command="$(xUnitRunner) @(TestAssemblies, ' ') -trait $(TestFilter) -html $(TestOutput)"/>
36+
<Exec Condition="'$(Configuration)' == 'Debug'" Command="$(xUnitRunner) @(TestAssemblies, ' ') -trait $(TestFilter) -html $(TestOutput)" />
3737
</Target>
3838

3939
<Target Name="netstandard20">

build/pack.proj

+9-9
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@
1717
</PropertyGroup>
1818

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

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

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

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

4646
<!-- https://stackoverflow.com/a/2012178/294804 -->
4747
<CreateItem Include="@(Net452Paths->'%(Filename)%(Extension)')" AdditionalMetadata="TargetPath=%(FullPath)">
48-
<Output TaskParameter="Include" ItemName="Net452Packages"/>
48+
<Output TaskParameter="Include" ItemName="Net452Packages" />
4949
</CreateItem>
5050
<CreateItem Include="@(NetStandard20Paths->'%(Filename)%(Extension)')" AdditionalMetadata="TargetPath=%(FullPath)">
51-
<Output TaskParameter="Include" ItemName="NetStandard20Packages"/>
51+
<Output TaskParameter="Include" ItemName="NetStandard20Packages" />
5252
</CreateItem>
5353

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

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

6060
<ItemGroup>
6161
<Net452OnlyPackages Include="$(Net452PackDir)Microsoft.Azure.PowerShell.ScenarioTest.*.nupkg;$(Net452PackDir)Microsoft.Azure.PowerShell.ServiceManagement.*.nupkg" Exclude="$(Net452PackDir)Microsoft.Azure.PowerShell.ScenarioTest.ResourceManager.*.nupkg" />

build/publish.proj

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="14.0" DefaultTargets="All" InitialTargets="CheckApiKey" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<Root>$(MSBuildThisFileDirectory)..\</Root>
5+
<Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
6+
<Artifacts>$(Root)artifacts\</Artifacts>
7+
<Tools>$(Root)tools\</Tools>
8+
<NuGet>$(Tools)NuGet-4.7.0\nuget.exe</NuGet>
9+
<PackDir>$(Artifacts)Package\$(Configuration)\</PackDir>
10+
</PropertyGroup>
11+
12+
<Target Name="CheckApiKey">
13+
<Error Text="ApiKey is not assigned a value!" Condition="'$(ApiKey)' == ''" />
14+
</Target>
15+
16+
<Target Name="All">
17+
<Message Importance="high" Text="Publish: All started" />
18+
<ItemGroup>
19+
<PackagePaths Include="$(PackDir)*.nupkg" />
20+
</ItemGroup>
21+
<Exec Command="$(NuGet) push %(PackagePaths.FullPath) -ApiKey $(ApiKey) -Source https://www.myget.org/F/azure-powershell/api/v2/package" />
22+
</Target>
23+
</Project>

0 commit comments

Comments
 (0)