Skip to content

[create-vsix] Improve compatibility with commercial .vsix #605

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
merged 1 commit into from
May 25, 2017
+22 −12
Merged

[create-vsix] Improve compatibility with commercial .vsix #605

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
9 changes: 7 additions & 2 deletions build-tools/create-vsix/create-vsix.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,19 @@
<IncludeCopyLocalReferencesInVSIXContainer>False</IncludeCopyLocalReferencesInVSIXContainer>
<IncludeDebugSymbolsInLocalVSIXDeployment>False</IncludeDebugSymbolsInLocalVSIXDeployment>
<IncludeDebugSymbolsInVSIXContainer>False</IncludeDebugSymbolsInVSIXContainer>
<IsProductComponent Condition=" '$(IsProductComponent)' == '' ">False</IsProductComponent>
<IsExperimental Condition=" '$(IsExperimental)' == '' ">true</IsExperimental>
<IsProductComponent Condition=" '$(IsProductComponent)' == '' ">True</IsProductComponent>
<_BuildVsix Condition=" '$(CreateVsixContainer)' == 'True' And Exists ('$(VsSDKInstall)') ">True</_BuildVsix>
<_BuildVsix Condition=" '$(_BuildVsix)' == '' ">False</_BuildVsix>
<ExtensionInstallationFolder>Xamarin.Android.Sdk</ExtensionInstallationFolder>
<OutputPath>bin\$(Configuration)</OutputPath>
</PropertyGroup>
<Import Project="..\..\Configuration.props" />
<ItemGroup>
<Content Include="Resources\AndroidSdkPackage.ico" />
<Content Include="Resources\AndroidSdkPackage.ico">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<Content Include="Xamarin.Android.Sdk.pkgdef">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<IncludeInVSIX>True</IncludeInVSIX>
Expand Down
12 changes: 3 additions & 9 deletions build-tools/create-vsix/create-vsix.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,14 @@
Returns="@(MSBuild);@(ReferenceAssemblies)">
<ItemGroup>
<MSBuild Include="$(LibDir)xbuild\**\*.*" />
<MSBuild Remove="$(LibDir)xbuild\Xamarin\Android\lib\host-*\**\*.*" />
<MSBuild Remove="$(LibDir)xbuild\Xamarin\Android\lib\host-Darwin\**\*.*" />
<MSBuild Remove="$(LibDir)xbuild\Xamarin\Android\lib\host-Linux\**\*.*" />
<MSBuild>
<VSIXSubPath Condition=" '%(VSIXSubPath)' == '' ">%(RecursiveDir)</VSIXSubPath>
</MSBuild>
<MSBuild Include="$(LibDir)xbuild\Xamarin\Android\lib\host-mxe-Win64\*.*" />
<MSBuild>
<VSIXSubPath Condition=" '%(VSIXSubPath)' == '' ">Xamarin/Android</VSIXSubPath>
</MSBuild>
<MSBuild Include="$(LibDir)xbuild\Xamarin\Android\lib\host-win\*.*" />
<MSBuild>
<VSIXSubPath Condition=" '%(VSIXSubPath)' == '' ">Xamarin/Android/lib/host-win</VSIXSubPath>
</MSBuild>
Expand All @@ -45,7 +44,6 @@
</MSBuild>
<MSBuild Include="..\..\bin\$(Configuration)\lib\mandroid\**\*.*" />
<MSBuild Remove="..\..\bin\$(Configuration)\lib\mandroid\**\*.d.exe" />
<MSBuild Remove="..\..\bin\$(Condition)\lib\mandroid\host-Darwin\**\*.*" />
<MSBuild>
<VSIXSubPath Condition=" '%(VSIXSubPath)' == '' ">Xamarin/Android/%(RecursiveDir)</VSIXSubPath>
</MSBuild>
Expand Down Expand Up @@ -81,15 +79,11 @@
DependsOnTargets="GetXAVersionInfo"
Returns="$(VsixVersion)">
<PropertyGroup>
<VsixVersion>$(ProductVersion).$(_XACommitCount)</VsixVersion>
<VsixVersion>$(ProductVersion).$(XAVersionCommitCount)</VsixVersion>
</PropertyGroup>
</Target>
<Target Name="GetIsExperimental"
Returns="$(IsExperimental)">
<PropertyGroup>
<IsExperimental>true</IsExperimental>
<IsExperimental Condition=" '$(IsProductComponent)' == 'True' ">false</IsExperimental>
</PropertyGroup>
</Target>
<Target Name="_CreateDependencies"
DependsOnTargets="GetXAVersionInfo"
Expand Down
1 change: 1 addition & 0 deletions build-tools/scripts/BuildEverything.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ create-vsix:
MONO_IOMAP=all MONO_OPTIONS=--arch=64 msbuild $(MSBUILD_FLAGS) /p:Configuration=$(conf) /p:CreateVsixContainer=True \
build-tools/create-vsix/create-vsix.csproj \
$(if $(VSIX),"/p:VsixPath=$(VSIX)") \
$(if $(EXPERIMENTAL),/p:IsExperimental="$(EXPERIMENTAL)") \
$(if $(PRODUCT_COMPONENT),/p:IsProductComponent="$(PRODUCT_COMPONENT)") \
$(if $(PACKAGE_VERSION),/p:ProductVersion="$(PACKAGE_VERSION)") \
$(if $(PACKAGE_HEAD_BRANCH),/p:XAVersionBranch="$(PACKAGE_HEAD_BRANCH)") \
Expand Down
6 changes: 6 additions & 0 deletions build-tools/xa-prep-tasks/xa-prep-tasks.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
<_VersionCommitFile>..\..\bin\$(Configuration)\Version.commit</_VersionCommitFile>
<_VersionRevFile>..\..\bin\$(Configuration)\Version.rev</_VersionRevFile>
<_XAVersionFile>$(_XAPrefix)\Version</_XAVersionFile>
<_XAVersionTxtFile>$(_XAPrefix)\Version.txt</_XAVersionTxtFile>
<_XAVersionCommitFile>$(_XAPrefix)\Version.commit</_XAVersionCommitFile>
<_XAVersionRevFile>$(_XAPrefix)\Version.rev</_XAVersionRevFile>
</PropertyGroup>
Expand All @@ -32,6 +33,11 @@
Lines="$(ProductVersion)"
Overwrite="True"
/>
<WriteLinesToFile
File="$(_XAVersionTxtFile)"
Lines="$(ProductVersion)"
Overwrite="True"
/>
<WriteLinesToFile
File="$(_VersionCommitFile)"
Lines="xamarin-android/$(XAVersionBranch)/$(XAVersionHash)"
Expand Down
6 changes: 5 additions & 1 deletion src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,11 @@
<Copy
SourceFiles="$(_SupportLicense)"
DestinationFiles="$(OutputPath)..\..\..\mandroid\MULTIDEX_JAR_LICENSE" />
<Touch Files="$(OutputPath)..\..\..\mandroid\MULTIDEX_JAR_LICENSE" />
<Copy
SourceFiles="$(_SupportLicense)"
DestinationFiles="$(OutputPath)..\..\..\mandroid\MULTIDEX_JAR_LICENSE.txt"
/>
<Touch Files="$(OutputPath)..\..\..\mandroid\MULTIDEX_JAR_LICENSE;$(OutputPath)..\..\..\mandroid\MULTIDEX_JAR_LICENSE.txt" />
</Target>

<ItemGroup>
Expand Down