Skip to content
This repository was archived by the owner on Feb 21, 2019. It is now read-only.

Commit d39f75d

Browse files
tobyhu87tobyhu87
committed
Merge pull request #25 from Microsoft/users/tobyhu/improv
Users/tobyhu/improv
2 parents 9879f0a + b54baab commit d39f75d

File tree

7 files changed

+52
-2
lines changed

7 files changed

+52
-2
lines changed

‎lib/Common.csproj.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
4-
<SignAssembly>false</SignAssembly>
4+
<SignAssembly>true</SignAssembly>
55
</PropertyGroup>
66
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
77
<Import Project="Branding.targets" />

‎src/Uninstall_Wrapper/Uninstall_Wrapper.csproj‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props" Condition="Exists('..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props')" />
34
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), Uninstaller.sln))\lib\Common.props" />
45
<PropertyGroup>
56
<ApplicationManifest>app.manifest</ApplicationManifest>
@@ -57,6 +58,7 @@
5758
<EmbeddedResource Include="DataFile.bin">
5859
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
5960
</EmbeddedResource>
61+
<None Include="packages.config" />
6062
</ItemGroup>
6163
<ItemGroup>
6264
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
@@ -84,4 +86,12 @@
8486
</ProjectReference>
8587
</ItemGroup>
8688
<Import Project="$(SolutionDir)lib\Common.targets" />
89+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
90+
<PropertyGroup>
91+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
92+
</PropertyGroup>
93+
<Error Condition="!Exists('..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props'))" />
94+
<Error Condition="!Exists('..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets'))" />
95+
</Target>
96+
<Import Project="..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets" Condition="Exists('..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets')" />
8797
</Project>

‎src/Uninstall_Wrapper/packages.config‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="MicroBuild.Core" version="0.2.0" targetFramework="net40" developmentDependency="true" />
4+
</packages>

‎src/VS.ConfigurationManager.Support/VS.ConfigurationManager.Support.csproj‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props" Condition="Exists('..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props')" />
34
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), Uninstaller.sln))\lib\Common.props" />
45
<PropertyGroup>
56
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -12,6 +13,8 @@
1213
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1314
<FileAlignment>512</FileAlignment>
1415
<TargetFrameworkProfile />
16+
<NuGetPackageImportStamp>
17+
</NuGetPackageImportStamp>
1518
</PropertyGroup>
1619
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1720
<DebugSymbols>true</DebugSymbols>
@@ -60,5 +63,16 @@
6063
<Authenticode>Microsoft</Authenticode>
6164
</FilesToSign>
6265
</ItemGroup>
66+
<ItemGroup>
67+
<None Include="packages.config" />
68+
</ItemGroup>
6369
<Import Project="$(SolutionDir)lib\Common.targets" />
70+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
71+
<PropertyGroup>
72+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
73+
</PropertyGroup>
74+
<Error Condition="!Exists('..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props'))" />
75+
<Error Condition="!Exists('..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets'))" />
76+
</Target>
77+
<Import Project="..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets" Condition="Exists('..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets')" />
6478
</Project>

‎src/VS.ConfigurationManager.Support/packages.config‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="MicroBuild.Core" version="0.2.0" targetFramework="net40" developmentDependency="true" />
4+
</packages>

‎src/VS.ConfigurationManager/VS.ConfigurationManager.csproj‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props" Condition="Exists('..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props')" />
34
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), Uninstaller.sln))\lib\Common.props" />
45
<PropertyGroup>
56
<ProjectGuid>{CACCC6E1-FCB8-4DBE-9159-0F8EAA69D27A}</ProjectGuid>
67
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
78
<TargetFrameworkProfile />
9+
<NuGetPackageImportStamp>
10+
</NuGetPackageImportStamp>
811
</PropertyGroup>
912
<PropertyGroup>
1013
<OutputType>Library</OutputType>
@@ -60,7 +63,7 @@
6063
<Content Include="External\wix.dll" />
6164
</ItemGroup>
6265
<ItemGroup>
63-
<FilesToSign Include="$(OutDir)\VS.ConfigurationManager.dll">
66+
<FilesToSign Include="$(OutDir)\Setup.VS.ConfigurationManager.dll">
6467
<Authenticode>Microsoft</Authenticode>
6568
</FilesToSign>
6669
</ItemGroup>
@@ -70,5 +73,16 @@
7073
<Name>VS.ConfigurationManager.Support</Name>
7174
</ProjectReference>
7275
</ItemGroup>
76+
<ItemGroup>
77+
<None Include="packages.config" />
78+
</ItemGroup>
7379
<Import Project="$(SolutionDir)lib\Common.targets" />
80+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
81+
<PropertyGroup>
82+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
83+
</PropertyGroup>
84+
<Error Condition="!Exists('..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props'))" />
85+
<Error Condition="!Exists('..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets'))" />
86+
</Target>
87+
<Import Project="..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets" Condition="Exists('..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets')" />
7488
</Project>

‎src/VS.ConfigurationManager/packages.config‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="MicroBuild.Core" version="0.2.0" targetFramework="net40" developmentDependency="true" />
4+
</packages>

0 commit comments

Comments
 (0)