Skip to content
This repository was archived by the owner on Jul 2, 2022. It is now read-only.

Remove SystemComponent behavior and double-build of VSIX #3

Merged
mauroa merged 1 commit into from
Sep 4, 2016
Merged

Remove SystemComponent behavior and double-build of VSIX #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions build.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,16 +54,10 @@
<Target Name="Package" DependsOnTargets="BuildInstaller;BuildPackages" />

<Target Name="BuildInstaller" DependsOnTargets="GitInfo">
<!-- Refresh the VSIX with the SystemComponent flag now for redistribution -->
<Message Importance="$(DefaultImportance)" Text="Refreshing VSIX with IsSystemComponent=true" />
<Exec Command="rmdir src\Vsix\Merq.Vsix\bin\$(Configuration) /S /Q" ContinueOnError="true" StandardOutputImportance="low" />
<Exec Command="rmdir src\Vsix\Merq.Vsix\obj\$(Configuration) /S /Q" ContinueOnError="true" StandardOutputImportance="low" />

<MSBuild Projects="@(Solution)" Properties="$(CommonBuildProperties);IsSystemComponent=true" />
<Exec Command="$(PackagesPath)\gitlink\lib\net45\GitLink.exe . -f &quot;$([System.String]::new('%(Solution.FullPath)').Replace('$(MSBuildProjectDirectory)', '').TrimStart('\').TrimStart('/'))&quot; -u https://github.com/MobileEssentials/Merq -b &quot;$(GitBranch)&quot; -c &quot;$(Configuration)&quot;" StandardOutputImportance="low" />

<MSBuild Projects="src\Installers\Merq.Installer\Merq.Installer.nuproj"
Properties="$(CommonBuildProperties);IsSystemComponent=true"
Properties="$(CommonBuildProperties)"
Targets="Build;GetTargetPath">
<Output ItemName='InstallerPackage' TaskParameter='TargetOutputs' />
</MSBuild>
Expand Down
6 changes: 0 additions & 6 deletions src/Vsix/Merq.Vsix/Merq.Vsix.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,12 @@
<Import Project="..\..\Merq.targets" />
<Import Project="Merq.Vsix.BindingRedirects.targets" />

<PropertyGroup>
<IsSystemComponent Condition=" '$(IsSystemComponent)' == '' ">false</IsSystemComponent>
</PropertyGroup>

<Target Name="GetVersion" DependsOnTargets="GitVersion" Returns="$(Version)">
<PropertyGroup>
<Version>$(GitSemVerMajor).$(GitSemVerMinor).$(GitSemVerPatch)</Version>
</PropertyGroup>
</Target>

<Target Name="GetSystemComponent" Returns="$(IsSystemComponent)" />

<Target Name="SetVsixDeploymentPath"
DependsOnTargets="GetVsixDeploymentPath"
AfterTargets="GetVsixDeploymentPath"
Expand Down