Skip to content

Allow Stack to build using Common packages #7023

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MiYanni merged 23 commits into from
Aug 24, 2018
Merged

Allow Stack to build using Common packages #7023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
1f4cab7
Moved all Stack modules into StackAdmin folder.
MiYanni Aug 17, 2018
ce9d443
Moved Stack solution to StackAdmin folder.
MiYanni Aug 17, 2018
6a7f104
RM/Storage modules/tests for Stack are building. Tests for Storage.Ma…
MiYanni Aug 21, 2018
2d2b6ed
Made AzureBridge work with Common packages.
MiYanni Aug 21, 2018
6741f91
Backup.Admin now using Common packages.
MiYanni Aug 21, 2018
59fa565
Commerce.Admin now using Common packages.
MiYanni Aug 21, 2018
21d2b2b
Compute.Admin now using Common packages.
MiYanni Aug 21, 2018
bfa90fd
Fabric.Admin now using Common packages.
MiYanni Aug 21, 2018
34889f0
Gallery.Admin now using Common packages. Fixed many NuGet.Config pack…
MiYanni Aug 21, 2018
4e9fe9f
InfrastructureInsights.Admin now using Common packages.
MiYanni Aug 21, 2018
ca2ff48
KeyVault.Admin now using Common packages.
MiYanni Aug 21, 2018
b8cc997
Network.Admin now using Common packages.
MiYanni Aug 21, 2018
76a0f5f
Storage.Admin now using Common packages.
MiYanni Aug 21, 2018
1a5b1a5
Subscriptions now using Common packages.
MiYanni Aug 21, 2018
6a2f37d
Subscriptions.Admin now using Common packages.
MiYanni Aug 21, 2018
3866f9c
Update.Admin now using Common packages.
MiYanni Aug 21, 2018
3ca4ccf
Allowed the Compute.sln to build properly. Stack.sln now also builds …
MiYanni Aug 22, 2018
45d5e33
Allows Stack to be built as part of the normal build processes.
MiYanni Aug 22, 2018
7072f46
Merge branch 'preview' into common-stack
MiYanni Aug 22, 2018
b1419ca
Removed the Sync and Vhd versions from Stack since they are not used.
MiYanni Aug 22, 2018
7d2cc00
Removed Stack's Commands.Compute.Test entirely, as instructed by the …
MiYanni Aug 23, 2018
bb4cccb
Removed commented references/items from a few csproj files.
MiYanni Aug 23, 2018
adcb94b
Reverted WindowsAzure.Management.Storage back to previous version. Ad…
MiYanni Aug 23, 2018
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
  •  
  •  
  •  
0 NuGet.config → NuGet.Config
View file
Open in desktop
File renamed without changes.
72 changes: 31 additions & 41 deletions build.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,11 @@


<ItemGroup>
<LocalBuildTasks Include="$(LibraryToolsFolder)\RepoTasks\RepoTasks.sln" Condition="'$(NetCore)' == 'false'"/>
<StackSolution Include="$(LibrarySourceFolder)\Stack.sln" Condition="'$(Scope)' == 'Stack'"/>
<CommonSolution Include="$(LibrarySourceFolder)\Common\Common.sln" Condition="'$(Scope)' == 'Stack'" />
<LocalBuildTasks Include="$(LibraryToolsFolder)\RepoTasks\RepoTasks.sln" Condition="'$(NetCore)' == 'false'" />
<StackSolution Include="$(LibrarySourceFolder)\StackAdmin\Stack.sln" Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Stack'" />
<StaticAnalysis Include=".\tools\StaticAnalysis\StaticAnalysis.sln" />
<LocalBuildTasks Include="$(LibraryToolsFolder)\BuildPackagesTask\Microsoft.Azure.Build.Tasks.sln" />
<LocalBuildTasks Include="$(LibraryToolsFolder)\RepoTasks\RepoTasks.sln" Condition="'$(NetCore)' == 'false'"/>
<LocalBuildTasks Include="$(LibraryToolsFolder)\RepoTasks\RepoTasks.sln" Condition="'$(NetCore)' == 'false'" />
</ItemGroup>

<!-- Tasks -->
Expand Down Expand Up @@ -200,10 +199,8 @@
<Exec Command="$(NuGetCommand) sources add -Name nugetRemote -Source &quot;https://api.nuget.org/v3/index.json&quot; $(NuGetRestoreConfigSwitch)"/>
<!-- Restore packages -->
<Exec Command="$(NuGetCommand) restore %(StackSolution.FullPath) $(NuGetRestoreConfigSwitch) $(NuGetRestorePackageSetting)"
Condition="'$(Scope)' == 'Stack'"
Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Stack'"
ContinueOnError="false" />
<Exec Command="$(NuGetCommand) restore %(CommonSolution.FullPath) $(NuGetRestoreConfigSwitch) $(NuGetRestorePackageSetting)"
ContinueOnError="false" Condition="'$(Scope)' == 'Stack'" />
<!-- Restore packages for static analysis-->
<Exec Command="$(NuGetCommand) restore %(StaticAnalysis.FullPath) $(NuGetRestoreConfigSwitch) $(NuGetRestorePackageSetting)"
ContinueOnError="false" />
Expand Down Expand Up @@ -280,14 +277,7 @@
<MakeDir Directories="$(PackageDirectory)"
Condition="'$(Scope)' != 'Stack'" />
<MakeDir Directories="$(StackPackageFolder)"
Condition="'$(Scope)' == 'Stack'" />

<MSBuild Projects="@(CommonSolution)"
Targets="Build"
Properties="Configuration=$(Configuration);Platform=Any CPU"
BuildInParallel="$(BuildInParallel)"
Condition="'$(Scope)' == 'Stack'"
ContinueOnError="false" />
Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Stack'" />

<MSBuild Projects="@(CmdletSolutionsToBuild)"
Targets="Build"
Expand All @@ -299,7 +289,7 @@
Targets="Build"
Properties="Configuration=$(Configuration);Platform=Any CPU"
BuildInParallel="$(BuildInParallel)"
Condition="'$(Scope)' == 'Stack'"
Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Stack'"
ContinueOnError="false" />

<Exec Command="$(PowerShellCommandPrefix) &quot;$ProgressPreference = 'SilentlyContinue';. $(LibraryToolsFolder)\GenerateHelp.ps1 -ValidateMarkdownHelp -GenerateMamlHelp -BuildConfig $(Configuration) -FilteredModules '@(ModulesChanged)' &quot;"
Expand All @@ -311,61 +301,61 @@

<Exec ContinueOnError="false"
Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot; . $(LibraryToolsFolder)\NewHelpIndex.ps1 -OutputFile $(PackageDirectory)\index.json -BuildConfig $(Configuration) &quot;"
Condition=" ('$(Scope)' == 'All' or '$(Scope)' == 'Latest') and $(CodeSign) == 'true'"/>
Condition="('$(Scope)' == 'All' or '$(Scope)' == 'Latest') and $(CodeSign) == 'true'" />

<!-- Copying modules to be signed -->

<!-- AzureRM -->
<Copy SourceFiles="$(LibraryToolsFolder)\AzureRM\AzureRM.psd1"
DestinationFolder="$(PackageDirectory)\$(Configuration)"
ContinueOnError="false"
Condition= " '$(Scope)' == 'All' or '$(Scope)' == 'Latest' "/>
Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Latest'" />
<Copy SourceFiles="$(LibraryToolsFolder)\AzureRM\AzureRM.psm1"
DestinationFolder="$(PackageDirectory)\$(Configuration)"
ContinueOnError="false"
Condition= " '$(Scope)' == 'All' or '$(Scope)' == 'Latest' "/>
Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Latest'" />

<!-- Stack Specific -->
<Copy SourceFiles="$(LibrarySourceFolder)\StackAdmin\AzureRM\AzureRM.psd1"
DestinationFolder="$(StackPackageFolder)\$(Configuration)"
ContinueOnError="false"
Condition= " '$(Scope)' == 'Stack' "/>
Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Stack'" />
<Copy SourceFiles="$(LibrarySourceFolder)\StackAdmin\AzureRM\AzureRM.psm1"
DestinationFolder="$(StackPackageFolder)\$(Configuration)"
ContinueOnError="false"
Condition= " '$(Scope)' == 'Stack' "/>
Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Stack'" />

<Copy SourceFiles="$(LibrarySourceFolder)\StackAdmin\AzureStack\AzureStack.psd1"
DestinationFolder="$(StackPackageFolder)\$(Configuration)"
ContinueOnError="false"
Condition= " '$(Scope)' == 'Stack' "/>
Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Stack'" />
<Copy SourceFiles="$(LibrarySourceFolder)\StackAdmin\AzureStack\AzureStack.psm1"
DestinationFolder="$(StackPackageFolder)\$(Configuration)"
ContinueOnError="false"
Condition= " '$(Scope)' == 'Stack' "/>
Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Stack'" />

<CallTarget Targets="CodeSignBinaries" Condition=" '$(CodeSign)' == 'true' " />

<Exec ContinueOnError="false"
Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot; . $(LibraryToolsFolder)\NewOutputTypeIndex.ps1 -OutputFile $(PackageDirectory)\outputtypes.json -BuildConfig $(Configuration) &quot;"
Condition=" ('$(Scope)' == 'All' or '$(Scope)' == 'Latest') and $(CodeSign) == 'true'"/>
Condition="('$(Scope)' == 'All' or '$(Scope)' == 'Latest') and $(CodeSign) == 'true'" />

<!-- AzureRM -->
<Copy SourceFiles="$(PackageDirectory)\$(Configuration)\AzureRM.psd1"
DestinationFolder="$(LibraryToolsFolder)\AzureRM" Condition= " '$(Scope)' == 'All' or '$(Scope)' == 'Latest' "/>
DestinationFolder="$(LibraryToolsFolder)\AzureRM" Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Latest'" />
<Copy SourceFiles="$(PackageDirectory)\$(Configuration)\AzureRM.psm1"
DestinationFolder="$(LibraryToolsFolder)\AzureRM" Condition= " '$(Scope)' == 'All' or '$(Scope)' == 'Latest' "/>
DestinationFolder="$(LibraryToolsFolder)\AzureRM" Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Latest'" />

<!-- Stack -->
<Copy SourceFiles="$(StackPackageFolder)\$(Configuration)\AzureRM.psd1"
DestinationFolder="$(LibrarySourceFolder)\StackAdmin\AzureRM" Condition= " '$(Scope)' == 'Stack' "/>
DestinationFolder="$(LibrarySourceFolder)\StackAdmin\AzureRM" Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Stack'" />
<Copy SourceFiles="$(StackPackageFolder)\$(Configuration)\AzureRM.psm1"
DestinationFolder="$(LibrarySourceFolder)\StackAdmin\AzureRM" Condition= " '$(Scope)' == 'Stack' "/>
DestinationFolder="$(LibrarySourceFolder)\StackAdmin\AzureRM" Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Stack'" />

<Copy SourceFiles="$(StackPackageFolder)\$(Configuration)\AzureStack.psd1"
DestinationFolder="$(LibrarySourceFolder)\StackAdmin\AzureStack" Condition= " '$(Scope)' == 'Stack' "/>
DestinationFolder="$(LibrarySourceFolder)\StackAdmin\AzureStack" Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Stack'" />
<Copy SourceFiles="$(StackPackageFolder)\$(Configuration)\AzureStack.psm1"
DestinationFolder="$(LibrarySourceFolder)\StackAdmin\AzureStack" Condition= " '$(Scope)' == 'Stack' "/>
DestinationFolder="$(LibrarySourceFolder)\StackAdmin\AzureStack" Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Stack'" />

<Message Importance="high" Text="Running Static Analyser" />
<CallTarget targets="DependencyAnalysis" ContinueOnError="ErrorAndContinue" />
Expand Down Expand Up @@ -474,11 +464,11 @@
</ItemGroup>

<!-- Stack -->
<ItemGroup Condition="'$(Scope)' == 'Stack'">
<DelaySignedAssembliesToSign Include="$(StackPackageFolder)\$(Configuration)\**\Microsoft*Azure*Commands*.dll" />
<ItemGroup Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Stack'">
<DelaySignedAssembliesToSign Include="$(StackPackageFolder)\$(Configuration)\**\Microsoft*Azure*Commands*.dll" Exclude="$(StackPackageFolder)\$(Configuration)\**\Microsoft*Azure*Commands*Common*.dll" />
<DelaySignedAssembliesToSign Include="$(StackPackageFolder)\$(Configuration)\**\Microsoft.Azure.Common.Extensions.dll" />
<DelaySignedAssembliesToSign Include="$(StackPackageFolder)\$(Configuration)\**\Microsoft.Azure.Management.Sql.Legacy.dll" />
</ItemGroup>
</ItemGroup>

<Message Importance="high" Text="$(PackageDirectory)\$(Configuration) does not contains any files to sign. Code sign will skip."
Condition="'@(DelaySignedAssembliesToSign)' == ''" />
Expand Down Expand Up @@ -515,11 +505,11 @@

<!-- Copying shortcut to be signed -->
<Copy SourceFiles="$(LibraryRoot)tools\AzureRM\AzureRM.psm1"
DestinationFolder="$(PackageDirectory)\$(Configuration)" Condition= "'$(Scope)' == 'All' or '$(Scope)' == 'Latest'"/>
DestinationFolder="$(PackageDirectory)\$(Configuration)" Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Latest'" />
<Copy SourceFiles="$(LibrarySourceFolder)\StackAdmin\AzureRM\AzureRM.psm1"
DestinationFolder="$(StackPackageFolder)\$(Configuration)" Condition="'$(Scope)' == 'Stack'"/>
DestinationFolder="$(StackPackageFolder)\$(Configuration)" Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Stack'" />
<Copy SourceFiles="$(LibrarySourceFolder)\StackAdmin\AzureStack\AzureStack.psm1"
DestinationFolder="$(StackPackageFolder)\$(Configuration)" Condition="'$(Scope)' == 'Stack'"/>
DestinationFolder="$(StackPackageFolder)\$(Configuration)" Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Stack'" />


<!-- Azure -->
Expand All @@ -531,7 +521,7 @@
</ItemGroup>

<!-- Stack -->
<ItemGroup Condition="'$(Scope)' == 'Stack'">
<ItemGroup Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Stack'">
<ScriptsToSign Include="$(StackPackageFolder)\$(Configuration)\**\*.ps1"/>
<ScriptsToSign Include="$(StackPackageFolder)\$(Configuration)\**\*.psm1"/>
<ScriptsToSign Include="$(StackPackageFolder)\$(Configuration)\**\*.ps1xml"/>
Expand All @@ -554,7 +544,7 @@
ContinueOnError="ErrorAndContinue" />

<Exec Command="$(PowerShellCommandPrefix) &quot;. $(LibraryToolsFolder)\CheckSignature.ps1 -CustomPath $(StackPackageFolder)\$(Configuration) &quot;"
Condition="'$(Scope)' == 'Stack'"
Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Stack'"
ContinueOnError="ErrorAndContinue" />

<!-- Copying signed shortcut back -->
Expand Down Expand Up @@ -621,7 +611,7 @@
Condition="'$(Scope)' != 'Stack'"/>

<Exec Command="$(PackageDirectory)\StaticAnalysis.exe $(StackPackageFolder)\$(Configuration) $(StackPackageFolder)"
Condition="'$(Scope)' == 'Stack'"
Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Stack'"
ContinueOnError="True"/>

<OnError ExecuteTargets="StaticAnalysisErrorMessage"/>
Expand Down Expand Up @@ -650,11 +640,11 @@
<Error Condition=" '$(NuGetKey)' == '' " Text="You must provide the NuGetKey parameter to the build: /p:NuGetKey=YOUR_PUBLISHING_KEY" />

<Exec Command="$(PowerShellCommandPrefix) &quot;. $(LibraryToolsFolder)\PublishModules.ps1 -IsNetCore:$$(NetCore) -BuildConfig $(Configuration) -Scope $(Scope) -ApiKey $(NuGetKey) -RepositoryLocation \&quot;$(NuGetPublishingSource)\&quot; &quot; -NugetExe $(NuGetCommand)"
Condition="'$(Scope)' !='Stack'"
Condition="'$(Scope)' != 'Stack'"
ContinueOnError="false"/>

<Exec Command="$(PowerShellCommandPrefix) &quot;. $(LibraryToolsFolder)\PublishModules.ps1 -IsNetCore:$$(NetCore) -BuildConfig $(Configuration) -Scope Stack -ApiKey $(NuGetKey) -RepositoryLocation \&quot;$(NuGetPublishingSource)\&quot; &quot; -NugetExe $(NuGetCommand)"
Condition="'$(Scope)' == 'Stack'"
Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Stack'"
ContinueOnError="false"/>

<CallTarget Targets="BuildInstaller" Condition="'$(Scope)' =='All'" />
Expand Down
0 src/Common/NuGet.config → src/Common/NuGet.Config
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
<NuGetPackageImportStamp>1017a61d</NuGetPackageImportStamp>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManager/Compute/Commands.Compute/Commands.Compute.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
<CodeAnalysisAdditionalOptions>/assemblyCompareMode:StrongNameIgnoringVersion</CodeAnalysisAdditionalOptions>
</PropertyGroup>
Expand Down
Loading