Skip to content

Commit 681fb93

Browse files
committed
update postbuild & wxi
1 parent 315c876 commit 681fb93

File tree

3 files changed

+43
-5
lines changed

3 files changed

+43
-5
lines changed

setup/azurecmdfiles.wxi

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1118,6 +1118,9 @@
11181118
<Component Id="cmp93A93C29B2093AFCB0348F2C5B999E64" Guid="*">
11191119
<File Id="fil3D666DBAA021AB26520C7A0308E583D4" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Storage\Newtonsoft.Json.dll" />
11201120
</Component>
1121+
<Component Id="cmp61DDE2E3D2FBB80AA9CED6F33128035D" Guid="*">
1122+
<File Id="fil7149B5FE830ECDCE2EACA3B4E8289AAF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Storage\PostBuild.ps1" />
1123+
</Component>
11211124
<Component Id="cmp7985D9505A461C04CC38A8D7F341EBC2" Guid="*">
11221125
<File Id="fil12F263F6FC0E5DBC1B0BCA1887AFD846" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Storage\System.Net.Http.Extensions.dll" />
11231126
</Component>
@@ -2764,6 +2767,9 @@
27642767
<Component Id="cmpA10291DA4F33CEBFB790A935E68C763C" Guid="*">
27652768
<File Id="filF5A4A20E3A90049515A936CA24C18514" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\Newtonsoft.Json.dll" />
27662769
</Component>
2770+
<Component Id="cmp8839023EABF68726F33F2E22907EE5CA" Guid="*">
2771+
<File Id="fil7E09EF4FC96DB53F9DCD865B90E854B6" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\PostBuild.ps1" />
2772+
</Component>
27672773
<Component Id="cmp0B5A5E6BA5861771073ED88DCAB35DCC" Guid="*">
27682774
<File Id="fil7399EB9870646ED4FE533B1842E6CE84" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Sql\ServiceManagementStartup.ps1" />
27692775
</Component>
@@ -2859,6 +2865,9 @@
28592865
<Component Id="cmp6ECD97BC8B820C8F075B08C926EE8E18" Guid="*">
28602866
<File Id="fil327F23A245CA0317EFF25FB727CC237C" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Storage\Newtonsoft.Json.dll" />
28612867
</Component>
2868+
<Component Id="cmp2788656715EE90B002A2DF2A355A4B7C" Guid="*">
2869+
<File Id="fil255776871423D5F544B74A1AA9926B3C" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Storage\PostBuild.ps1" />
2870+
</Component>
28622871
<Component Id="cmpDE403EAE6FDC0C14D1EC077F2D9DCDF6" Guid="*">
28632872
<File Id="fil63C9BDB6186929AAA2E72F85AA3A4558" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Storage\System.Net.Http.Extensions.dll" />
28642873
</Component>
@@ -3366,6 +3375,7 @@
33663375
<ComponentRef Id="cmp8CC873DBE9230381C5CDCADC4920348E" />
33673376
<ComponentRef Id="cmp1E206A516CD1793516989E02475DED35" />
33683377
<ComponentRef Id="cmp93A93C29B2093AFCB0348F2C5B999E64" />
3378+
<ComponentRef Id="cmp61DDE2E3D2FBB80AA9CED6F33128035D" />
33693379
<ComponentRef Id="cmp7985D9505A461C04CC38A8D7F341EBC2" />
33703380
<ComponentRef Id="cmp02ACACBB96C5AF339C3EF0B3D748D59D" />
33713381
<ComponentRef Id="cmpADC075B4FA9AC22F9AA7C27E98D28FBE" />
@@ -3894,6 +3904,7 @@
38943904
<ComponentRef Id="cmpB559FF7BECE247BF0FB2DEE533E5A820" />
38953905
<ComponentRef Id="cmp2DA9A48FC4B479D897435D7DCFA6DDE3" />
38963906
<ComponentRef Id="cmpA10291DA4F33CEBFB790A935E68C763C" />
3907+
<ComponentRef Id="cmp8839023EABF68726F33F2E22907EE5CA" />
38973908
<ComponentRef Id="cmp0B5A5E6BA5861771073ED88DCAB35DCC" />
38983909
<ComponentRef Id="cmp8FDC59E62622D98C6BE19E68ABC2666F" />
38993910
<ComponentRef Id="cmpE8892E4AE524E10FC9808A04A8A7D4BE" />
@@ -3925,6 +3936,7 @@
39253936
<ComponentRef Id="cmp294C3C7148D92CE8D41B74464DF7DEBD" />
39263937
<ComponentRef Id="cmpD77395F69A94BA2E235B63510FA5ACE2" />
39273938
<ComponentRef Id="cmp6ECD97BC8B820C8F075B08C926EE8E18" />
3939+
<ComponentRef Id="cmp2788656715EE90B002A2DF2A355A4B7C" />
39283940
<ComponentRef Id="cmpDE403EAE6FDC0C14D1EC077F2D9DCDF6" />
39293941
<ComponentRef Id="cmp558B809B6B758A29CA1CD1B340943369" />
39303942
<ComponentRef Id="cmp2D8EAF351C80F628AB412FA578D5DA1F" />

src/ServiceManagement/Storage/Commands.Storage/Commands.Storage.csproj

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,9 @@
264264
</None>
265265
<None Include="MSSharedLibKey.snk" />
266266
<None Include="packages.config" />
267+
<None Include="PostBuild.ps1">
268+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
269+
</None>
267270
</ItemGroup>
268271
<ItemGroup>
269272
<EmbeddedResource Include="Resources.resx">
@@ -281,10 +284,6 @@
281284
<Error Condition="Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
282285
</Target>
283286
<PropertyGroup>
284-
<PostBuildEvent>
285-
cd $(ProjectDir)
286-
set ResourceOutDir="..\..\..\Package\Debug\ResourceManager\AzureResourceManager\Storage\"
287-
IF NOT EXIST "%25ResourceOutDir%25" mkdir "%25ResourceOutDir%25"
288-
copy $(OutDir) "%25ResourceOutDir%25" /y</PostBuildEvent>
287+
<PostBuildEvent>powershell.exe -ExecutionPolicy Unrestricted -File "$(ProjectDir)\PostBuild.ps1" "..\..\..\ResourceManager\AzureResourceManager\Storage"</PostBuildEvent>
289288
</PropertyGroup>
290289
</Project>
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# ----------------------------------------------------------------------------------
2+
#
3+
# Copyright Microsoft Corporation
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
# Unless required by applicable law or agreed to in writing, software
9+
# distributed under the License is distributed on an "AS IS" BASIS,
10+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
# See the License for the specific language governing permissions and
12+
# limitations under the License.
13+
# ----------------------------------------------------------------------------------
14+
15+
Write-Output -InputObject 'Starting post-build script';
16+
17+
$destDir = $args[0];
18+
Write-Output -InputObject $destDir;
19+
20+
$sourcePath = "."
21+
22+
if (Test-Path -Path $sourcePath) {
23+
Write-Output -InputObject "Copying '$sourcePath' to directory '$destDir'";
24+
Copy-Item -Path $sourcePath -Destination $destDir -Recurse;
25+
}
26+
27+
Write-Output -InputObject 'Finished post-build script';

0 commit comments

Comments
 (0)