Skip to content

Commit b65f59e

Browse files
markcowlmarkcowl
authored
Merge pull request #31 from Azure/version-incrementing
Allow versioning for CI packages
2 parents 99309de + 9d7f148 commit b65f59e

23 files changed

+171
-44
lines changed

‎build.proj‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,17 @@
33
<PropertyGroup>
44
<Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
55
<Framework Condition="'$(Framework)' == ''">All</Framework>
6+
<FileVersion Condition="'$(FileVersion)' == ''">1.0.0.0</FileVersion>
7+
<PackageVersion Condition="'$(PackageVersion)' == ''">1.0.0</PackageVersion>
8+
<CommandArguments>/p:Configuration=$(Configuration) /p:FileVersion=$(FileVersion) /p:PackageVersion=$(PackageVersion) /t:$(Framework) /NoLogo</CommandArguments>
69
</PropertyGroup>
710

811
<Target Name="Build">
9-
<Exec Command="dotnet msbuild build/build.proj /p:Configuration=$(Configuration) /t:$(Framework) /NoLogo" />
12+
<Exec Command="dotnet msbuild build/build.proj $(CommandArguments)" />
1013
</Target>
1114

1215
<Target Name="Pack">
13-
<Exec Command="dotnet msbuild build/pack.proj /p:Configuration=$(Configuration) /t:$(Framework) /NoLogo" />
16+
<Exec Command="dotnet msbuild build/pack.proj $(CommandArguments)" />
1417
</Target>
1518

1619
<Target Name="All" DependsOnTargets="Build;Pack" />

‎build/build.proj‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project ToolsVersion="14.0" DefaultTargets="All" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<Root>$(MSBuildThisFileDirectory)..\</Root>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5+
<Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
66
<Artifacts>$(Root)artifacts\</Artifacts>
77
<TestFilter>"AcceptanceType=CheckIn"</TestFilter>
88
</PropertyGroup>
@@ -25,33 +25,35 @@
2525
<Message Importance="high" Text="net452: Building $([System.IO.Path]::GetFileName($(Solution)))" />
2626
<MSBuild Projects="$(Solution)" Properties="Configuration=$(Configuration)" />
2727

28-
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
28+
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
2929
<CurrentDate>$([System.DateTime]::Now.ToString(yyyy-MM-dd_hh_mm_ss))</CurrentDate>
3030
<TestOutput>$(Artifacts)Test\$(Framework)\TestResults_$(CurrentDate).html</TestOutput>
3131
</PropertyGroup>
32-
<ItemGroup Condition=" '$(Configuration)' == 'Debug' ">
32+
<ItemGroup Condition="'$(Configuration)' == 'Debug'">
3333
<TestAssemblies Include="$(OutputDir)*.Tests.dll;$(OutputDir)*.Test.dll;$(OutputDir)*.UnitTest.dll" />
3434
</ItemGroup>
35-
<Message Condition=" '$(Configuration)' == 'Debug' " Importance="high" Text="net452: Testing %(TestAssemblies.Filename)" />
36-
<Exec Condition=" '$(Configuration)' == 'Debug' " Command="$(xUnitRunner) @(TestAssemblies, ' ') -trait $(TestFilter) -html $(TestOutput)"/>
35+
<Message Condition="'$(Configuration)' == 'Debug'" Importance="high" Text="net452: Testing %(TestAssemblies.Filename)" />
36+
<Exec Condition="'$(Configuration)' == 'Debug'" Command="$(xUnitRunner) @(TestAssemblies, ' ') -trait $(TestFilter) -html $(TestOutput)"/>
3737
</Target>
3838

3939
<Target Name="netstandard20">
4040
<Message Importance="high" Text="Build: netstandard20 started" />
4141
<PropertyGroup>
4242
<Solution>$(Root)Azure.PowerShell.Common.Netcore.sln</Solution>
4343
<TestOutput>$(Artifacts)Test\</TestOutput>
44+
<FileVersion Condition="'$(FileVersion)' == ''">1.0.0.0</FileVersion>
45+
<AssemblyVersion Condition="'$(AssemblyVersion)' == ''">1.0.0.0</AssemblyVersion>
4446
</PropertyGroup>
4547

4648
<Message Importance="high" Text="netstandard20: Building $([System.IO.Path]::GetFileName($(Solution)))" />
47-
<Exec Command="dotnet build $(Solution) -c $(Configuration) -NoLogo" />
49+
<Exec Command="dotnet build $(Solution) -c $(Configuration) /p:FileVersion=$(FileVersion) /p:AssemblyVersion=$(AssemblyVersion) -NoLogo" />
4850

49-
<Message Condition=" '$(Configuration)' == 'Debug' " Importance="high" Text="netstandard20: Testing $([System.IO.Path]::GetFileName($(Solution)))" />
50-
<Exec Condition=" '$(Configuration)' == 'Debug' " Command="dotnet test $(Solution) --filter $(TestFilter) --configuration $(Configuration) --logger trx -NoLogo" ContinueOnError="ErrorAndContinue" />
51-
<ItemGroup Condition=" '$(Configuration)' == 'Debug' ">
51+
<Message Condition="'$(Configuration)' == 'Debug'" Importance="high" Text="netstandard20: Testing $([System.IO.Path]::GetFileName($(Solution)))" />
52+
<Exec Condition="'$(Configuration)' == 'Debug'" Command="dotnet test $(Solution) --filter $(TestFilter) --configuration $(Configuration) --logger trx -NoLogo" ContinueOnError="ErrorAndContinue" />
53+
<ItemGroup Condition="'$(Configuration)' == 'Debug'">
5254
<TestResults Include="$(Root)src\**\TestResults\*.trx" />
5355
</ItemGroup>
54-
<Move Condition=" '$(Configuration)' == 'Debug' " SourceFiles="@(TestResults)" DestinationFolder="$(TestOutput)" />
56+
<Move Condition="'$(Configuration)' == 'Debug'" SourceFiles="@(TestResults)" DestinationFolder="$(TestOutput)" />
5557
</Target>
5658

5759
<Target Name="All" DependsOnTargets="net452;netstandard20" />

‎build/pack.proj‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
<Project ToolsVersion="14.0" DefaultTargets="All" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<Root>$(MSBuildThisFileDirectory)..\</Root>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5+
<Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
66
<Artifacts>$(Root)artifacts\</Artifacts>
77
<Src>$(Root)src\</Src>
88
<Tools>$(Root)tools\</Tools>
99
<Net452PackDir>$(Artifacts)Package\$(Configuration)\net452\</Net452PackDir>
10+
<PackageVersion Condition="'$(PackageVersion)' == ''">1.0.0</PackageVersion>
1011
</PropertyGroup>
1112

1213
<Target Name="net452">
@@ -18,15 +19,15 @@
1819
<ItemGroup>
1920
<Net452Projects Include="$(Src)**\*.csproj" Exclude="$(Src)**\*.Netcore.csproj;$(Src)**\*.Tests.csproj;$(Src)**\*.Test.csproj;$(Src)**\*.UnitTest.csproj"/>
2021
</ItemGroup>
21-
<Exec Command="$(NuGet) pack %(Net452Projects.FullPath) -OutputDirectory $(Net452PackDir) -Properties Configuration=$(Configuration) -IncludeReferencedProjects"/>
22+
<Exec Command="$(NuGet) pack %(Net452Projects.FullPath) -OutputDirectory $(Net452PackDir) -Properties Configuration=$(Configuration) -Version $(PackageVersion)-preview -IncludeReferencedProjects"/>
2223
</Target>
2324

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

3233
<Target Name="All" DependsOnTargets="net452;netstandard20">

‎src/Aks/Aks.Netcore.csproj‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<TargetFramework>netstandard2.0</TargetFramework>
77
<AssemblyName>Microsoft.Azure.PowerShell.Aks</AssemblyName>
88
<RootNamespace>Microsoft.Azure.Commands.Common.Aks</RootNamespace>
9-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
109
<OutputPath>$(ProjectDir)..\..\artifacts\$(Configuration)</OutputPath>
1110
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1211
<WarningsAsErrors />
@@ -55,5 +54,11 @@
5554
</EmbeddedResource>
5655
</ItemGroup>
5756

57+
<ItemGroup>
58+
<Compile Remove="Properties\AssemblyInfo.cs" />
59+
<EmbeddedResource Remove="Properties\AssemblyInfo.cs" />
60+
<None Remove="Properties\AssemblyInfo.cs" />
61+
<Content Remove="Properties\AssemblyInfo.cs" />
62+
</ItemGroup>
5863

5964
</Project>

‎src/Authentication.Abstractions/Authentication.Abstractions.Netcore.csproj‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<TargetFramework>netstandard2.0</TargetFramework>
77
<AssemblyName>Microsoft.Azure.PowerShell.Authentication.Abstractions</AssemblyName>
88
<RootNamespace>Microsoft.Azure.Commands.Common.Authentication.Abstractions</RootNamespace>
9-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
109
<OutputPath>$(ProjectDir)..\..\artifacts\$(Configuration)</OutputPath>
1110
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1211
<WarningsAsErrors />
@@ -53,5 +52,12 @@
5352
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
5453
</EmbeddedResource>
5554
</ItemGroup>
56-
55+
56+
<ItemGroup>
57+
<Compile Remove="Properties\AssemblyInfo.cs" />
58+
<EmbeddedResource Remove="Properties\AssemblyInfo.cs" />
59+
<None Remove="Properties\AssemblyInfo.cs" />
60+
<Content Remove="Properties\AssemblyInfo.cs" />
61+
</ItemGroup>
62+
5763
</Project>

‎src/Authentication.ResourceManager/Authentication.ResourceManager.Netcore.csproj‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<TargetFramework>netstandard2.0</TargetFramework>
77
<AssemblyName>Microsoft.Azure.PowerShell.Authentication.ResourceManager</AssemblyName>
88
<RootNamespace>Microsoft.Azure.Commands.Common.Authentication.ResourceManager</RootNamespace>
9-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
109
<OutputPath>$(ProjectDir)..\..\artifacts\$(Configuration)</OutputPath>
1110
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1211
<WarningsAsErrors />
@@ -55,5 +54,12 @@
5554
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
5655
</EmbeddedResource>
5756
</ItemGroup>
58-
57+
58+
<ItemGroup>
59+
<Compile Remove="Properties\AssemblyInfo.cs" />
60+
<EmbeddedResource Remove="Properties\AssemblyInfo.cs" />
61+
<None Remove="Properties\AssemblyInfo.cs" />
62+
<Content Remove="Properties\AssemblyInfo.cs" />
63+
</ItemGroup>
64+
5965
</Project>

‎src/Authentication.Test/Authentication.Test.Netcore.csproj‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<TargetFramework>netcoreapp2.1</TargetFramework>
77
<AssemblyName>Microsoft.Azure.PowerShell.Authentication.Test</AssemblyName>
88
<RootNamespace>Microsoft.Azure.Authentication.Test</RootNamespace>
9-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
109
<OutputPath>$(ProjectDir)..\..\artifacts\$(Configuration)</OutputPath>
1110
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1211
<WarningsAsErrors />
@@ -28,4 +27,11 @@
2827
<ProjectReference Include="..\ScenarioTest.ResourceManager\ScenarioTest.ResourceManager.Netcore.csproj" />
2928
</ItemGroup>
3029

30+
<ItemGroup>
31+
<Compile Remove="Properties\AssemblyInfo.cs" />
32+
<EmbeddedResource Remove="Properties\AssemblyInfo.cs" />
33+
<None Remove="Properties\AssemblyInfo.cs" />
34+
<Content Remove="Properties\AssemblyInfo.cs" />
35+
</ItemGroup>
36+
3137
</Project>

‎src/Authentication/Authentication.Netcore.csproj‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<TargetFramework>netstandard2.0</TargetFramework>
77
<AssemblyName>Microsoft.Azure.PowerShell.Authentication</AssemblyName>
88
<RootNamespace>Microsoft.Azure.Commands.Common.Authentication</RootNamespace>
9-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
109
<OutputPath>$(ProjectDir)..\..\artifacts\$(Configuration)</OutputPath>
1110
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1211
<WarningsAsErrors />
@@ -62,5 +61,12 @@
6261
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
6362
</EmbeddedResource>
6463
</ItemGroup>
65-
64+
65+
<ItemGroup>
66+
<Compile Remove="Properties\AssemblyInfo.cs" />
67+
<EmbeddedResource Remove="Properties\AssemblyInfo.cs" />
68+
<None Remove="Properties\AssemblyInfo.cs" />
69+
<Content Remove="Properties\AssemblyInfo.cs" />
70+
</ItemGroup>
71+
6672
</Project>

‎src/Authorization/Authorization.Netcore.csproj‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<TargetFramework>netstandard2.0</TargetFramework>
77
<AssemblyName>Microsoft.Azure.PowerShell.Authorization</AssemblyName>
88
<RootNamespace>Microsoft.Azure.Commands.Common.Authorization</RootNamespace>
9-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
109
<OutputPath>$(ProjectDir)..\..\artifacts\$(Configuration)</OutputPath>
1110
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1211
<WarningsAsErrors />
@@ -54,5 +53,12 @@
5453
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
5554
</EmbeddedResource>
5655
</ItemGroup>
57-
56+
57+
<ItemGroup>
58+
<Compile Remove="Properties\AssemblyInfo.cs" />
59+
<EmbeddedResource Remove="Properties\AssemblyInfo.cs" />
60+
<None Remove="Properties\AssemblyInfo.cs" />
61+
<Content Remove="Properties\AssemblyInfo.cs" />
62+
</ItemGroup>
63+
5864
</Project>

‎src/Common/Common.Netcore.csproj‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<TargetFramework>netstandard2.0</TargetFramework>
77
<AssemblyName>Microsoft.Azure.PowerShell.Common</AssemblyName>
88
<RootNamespace>Microsoft.WindowsAzure.Commands.Common</RootNamespace>
9-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
109
<OutputPath>$(ProjectDir)..\..\artifacts\$(Configuration)</OutputPath>
1110
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1211
<WarningsAsErrors />
@@ -54,4 +53,12 @@
5453
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
5554
</EmbeddedResource>
5655
</ItemGroup>
56+
57+
<ItemGroup>
58+
<Compile Remove="Properties\AssemblyInfo.cs" />
59+
<EmbeddedResource Remove="Properties\AssemblyInfo.cs" />
60+
<None Remove="Properties\AssemblyInfo.cs" />
61+
<Content Remove="Properties\AssemblyInfo.cs" />
62+
</ItemGroup>
63+
5764
</Project>

0 commit comments

Comments
 (0)