Skip to content

Commit 5b3078e

Browse files
cormacpaynecormacpayne
committed
Miscellaneous updates for preview modules
1 parent 25b314d commit 5b3078e

File tree

3 files changed

+54
-14
lines changed

3 files changed

+54
-14
lines changed

‎build.proj

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -79,16 +79,16 @@
7979
<UsingTask TaskName="VerifyAuthenticodeSignatureTask" AssemblyFile="$(BuildTasksPath)\Microsoft.Azure.Build.Tasks.dll" />
8080
<UsingTask TaskName="SmartTestingTask" AssemblyFile="$(BuildTasksPath)\Microsoft.Azure.Build.Tasks.dll" />
8181
<UsingTask TaskName="SetEnvVar" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll" >
82-
<ParameterGroup>
83-
<EnvName ParameterType="System.String" Required="true" />
84-
<EnvValue ParameterType="System.String" Required="true" />
82+
<ParameterGroup>
83+
<EnvName ParameterType="System.String" Required="true" />
84+
<EnvValue ParameterType="System.String" Required="true" />
8585
</ParameterGroup>
8686
<Task>
87-
<Using Namespace="System"/>
88-
<Code Type="Fragment" Language="cs">
89-
<![CDATA[System.Environment.SetEnvironmentVariable(EnvName, EnvValue);]]>
90-
</Code>
91-
</Task>
87+
<Using Namespace="System"/>
88+
<Code Type="Fragment" Language="cs">
89+
<![CDATA[System.Environment.SetEnvironmentVariable(EnvName, EnvValue);]]>
90+
</Code>
91+
</Task>
9292
</UsingTask> <!--
9393
CI build related
9494
-->
@@ -196,17 +196,17 @@
196196
<MakeDir Directories="$(PackageDirectory)" />
197197
<Exec ContinueOnError="false"
198198
Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot; . $(LibraryToolsFolder)\CreateMappings.ps1 -RootPath $(LibrarySourceFolder) -OutputFile $(PackageDirectory)\groupMapping.json -WarningFile $(PackageDirectory)\groupMappingWarnings.json -RulesFile $(LibraryToolsFolder)\CreateMappings_rules.json &quot;" Condition="'$(Latest)' == 'true'"/>
199-
199+
200200
<MSBuild
201201
Projects="@(CmdletSolutionsToBuild)"
202202
Targets="Build"
203203
Properties="Configuration=$(Configuration);Platform=Any CPU"
204204
BuildInParallel="$(BuildInParallel)"
205205
ContinueOnError="false" />
206206

207-
<Exec Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\GenerateHelp.ps1 -ValidateMarkdownHelp -GenerateMamlHelp -BuildConfig $(Configuration) &quot;"
208-
ContinueOnError="false"
209-
Condition=" '$(SkipHelp)' == 'false' and '$(Latest)' == 'true'"/>
207+
<Exec Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;$ProgressPreference = 'SilentlyContinue';. $(LibraryToolsFolder)\GenerateHelp.ps1 -ValidateMarkdownHelp -GenerateMamlHelp -BuildConfig $(Configuration) &quot;"
208+
ContinueOnError="false"
209+
Condition=" '$(SkipHelp)' == 'false' and '$(Latest)' == 'true'"/>
210210
<CallTarget Targets="BuildSetupTest"/>
211211
<!-- moved copy tasks -->
212212

@@ -234,7 +234,7 @@
234234
DestinationFolder="$(LibrarySourceFolder)\Package\$(Configuration)"
235235
Condition=" '$(CodeSign)' == 'true' "/>
236236

237-
<CallTarget Targets="CodeSignBinaries" Condition=" '$(CodeSign)' == 'true' " />
237+
<CallTarget Targets="CodeSignBinaries" Condition=" '$(CodeSign)' == 'true' " />
238238

239239

240240
<Copy SourceFiles="$(LibrarySourceFolder)\Package\$(Configuration)\AzureRM.psd1"
@@ -535,4 +535,4 @@
535535
<Message Importance="high" Text="Running live tests..." />
536536
<CallTarget Targets="LiveTests"/>
537537
</Target>
538-
</Project>
538+
</Project>

‎src/ResourceManager/Profile/Commands.Profile/Commands.Profile.csproj

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,22 @@
146146
<Project>{d3804b64-c0d3-48f8-82ec-1f632f833c9e}</Project>
147147
<Name>Commands.Common.Authentication</Name>
148148
</ProjectReference>
149+
<ProjectReference Include="..\..\..\Common\Commands.Common.Authorization\Commands.Common.Authorization.csproj">
150+
<Project>{24508e26-154d-47f1-80ee-439bf0710996}</Project>
151+
<Name>Commands.Common.Authorization</Name>
152+
</ProjectReference>
153+
<ProjectReference Include="..\..\..\Common\Commands.Common.Graph.RBAC\Commands.Common.Graph.RBAC.csproj">
154+
<Project>{269acf73-0a34-42dc-ab9c-4b15931a489d}</Project>
155+
<Name>Commands.Common.Graph.RBAC</Name>
156+
</ProjectReference>
157+
<ProjectReference Include="..\..\..\Common\Commands.Common.Network\Commands.Common.Network.csproj">
158+
<Project>{1338f7ae-7111-4ed3-8916-2d0fecc876f4}</Project>
159+
<Name>Commands.Common.Network</Name>
160+
</ProjectReference>
161+
<ProjectReference Include="..\..\..\Common\Commands.Common.Storage\Commands.Common.Storage.csproj">
162+
<Project>{65c3a86a-716d-4e7d-ab67-1db00b3bf72d}</Project>
163+
<Name>Commands.Common.Storage</Name>
164+
</ProjectReference>
149165
<ProjectReference Include="..\..\..\Common\Commands.Common\Commands.Common.csproj">
150166
<Project>{5ee72c53-1720-4309-b54b-5fb79703195f}</Project>
151167
<Name>Commands.Common</Name>

‎src/ResourceManager/Profile/Profile.sln

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common.Authenticat
2626
EndProject
2727
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common.Authentication.ResourceManager", "..\Common\Commands.Common.Authentication.ResourceManager\Commands.Common.Authentication.ResourceManager.csproj", "{69C2EB6B-CD63-480A-89A0-C489706E9299}"
2828
EndProject
29+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common.Authorization", "..\..\Common\Commands.Common.Authorization\Commands.Common.Authorization.csproj", "{24508E26-154D-47F1-80EE-439BF0710996}"
30+
EndProject
31+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common.Graph.RBAC", "..\..\Common\Commands.Common.Graph.RBAC\Commands.Common.Graph.RBAC.csproj", "{269ACF73-0A34-42DC-AB9C-4B15931A489D}"
32+
EndProject
33+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common.Network", "..\..\Common\Commands.Common.Network\Commands.Common.Network.csproj", "{1338F7AE-7111-4ED3-8916-2D0FECC876F4}"
34+
EndProject
35+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common.Storage", "..\..\Common\Commands.Common.Storage\Commands.Common.Storage.csproj", "{65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}"
36+
EndProject
2937
Global
3038
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3139
Debug|Any CPU = Debug|Any CPU
@@ -76,6 +84,22 @@ Global
7684
{69C2EB6B-CD63-480A-89A0-C489706E9299}.Debug|Any CPU.Build.0 = Debug|Any CPU
7785
{69C2EB6B-CD63-480A-89A0-C489706E9299}.Release|Any CPU.ActiveCfg = Release|Any CPU
7886
{69C2EB6B-CD63-480A-89A0-C489706E9299}.Release|Any CPU.Build.0 = Release|Any CPU
87+
{24508E26-154D-47F1-80EE-439BF0710996}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
88+
{24508E26-154D-47F1-80EE-439BF0710996}.Debug|Any CPU.Build.0 = Debug|Any CPU
89+
{24508E26-154D-47F1-80EE-439BF0710996}.Release|Any CPU.ActiveCfg = Release|Any CPU
90+
{24508E26-154D-47F1-80EE-439BF0710996}.Release|Any CPU.Build.0 = Release|Any CPU
91+
{269ACF73-0A34-42DC-AB9C-4B15931A489D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
92+
{269ACF73-0A34-42DC-AB9C-4B15931A489D}.Debug|Any CPU.Build.0 = Debug|Any CPU
93+
{269ACF73-0A34-42DC-AB9C-4B15931A489D}.Release|Any CPU.ActiveCfg = Release|Any CPU
94+
{269ACF73-0A34-42DC-AB9C-4B15931A489D}.Release|Any CPU.Build.0 = Release|Any CPU
95+
{1338F7AE-7111-4ED3-8916-2D0FECC876F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
96+
{1338F7AE-7111-4ED3-8916-2D0FECC876F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
97+
{1338F7AE-7111-4ED3-8916-2D0FECC876F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
98+
{1338F7AE-7111-4ED3-8916-2D0FECC876F4}.Release|Any CPU.Build.0 = Release|Any CPU
99+
{65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
100+
{65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}.Debug|Any CPU.Build.0 = Debug|Any CPU
101+
{65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}.Release|Any CPU.ActiveCfg = Release|Any CPU
102+
{65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}.Release|Any CPU.Build.0 = Release|Any CPU
79103
EndGlobalSection
80104
GlobalSection(SolutionProperties) = preSolution
81105
HideSolutionNode = FALSE

0 commit comments

Comments
 (0)