Skip to content

Avoid zipping VS templates #7056

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
genlu merged 1 commit into from
Mar 12, 2021
Merged

Avoid zipping VS templates #7056

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
2 changes: 1 addition & 1 deletion src/Microsoft.DotNet.Arcade.Sdk/tools/DefaultVersions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
<MicrosoftDotNetIBCMergeVersion Condition="'$(MicrosoftDotNetIBCMergeVersion)' == ''">5.0.7-beta.20159.1</MicrosoftDotNetIBCMergeVersion>
<MicrosoftNETTestSdkVersion Condition="'$(MicrosoftNETTestSdkVersion)' == ''">16.6.1</MicrosoftNETTestSdkVersion>
<MicrosoftNetFrameworkReferenceAssembliesVersion Condition="'$(MicrosoftNetFrameworkReferenceAssembliesVersion)' == ''">1.0.0-preview.2</MicrosoftNetFrameworkReferenceAssembliesVersion>
<MicrosoftVSSDKBuildToolsVersion Condition="'$(MicrosoftVSSDKBuildToolsVersion)' == ''">15.1.192</MicrosoftVSSDKBuildToolsVersion>
<MicrosoftVSSDKBuildToolsVersion Condition="'$(MicrosoftVSSDKBuildToolsVersion)' == ''">16.9.1050</MicrosoftVSSDKBuildToolsVersion>
<MicrosoftDotnetNuGetRepackTasksVersion Condition="'$(MicrosoftDotnetNuGetRepackTasksVersion)' == ''">$(ArcadeSdkVersion)</MicrosoftDotnetNuGetRepackTasksVersion>
<MicrosoftDotNetSignToolVersion Condition="'$(MicrosoftDotNetSignToolVersion)' == ''">$(ArcadeSdkVersion)</MicrosoftDotNetSignToolVersion>
<MicrosoftTestPlatformVersion Condition="'$(MicrosoftTestPlatformVersion)' == ''">16.5.0</MicrosoftTestPlatformVersion>
Expand Down
29 changes: 22 additions & 7 deletions src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.VsixBuild.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,15 +247,30 @@
<Import Project="VisualStudio.ImportSdk.targets" Condition="'$(VSToolsPath)' != '' and ('$(IsVsixProject)' == 'true' or '$(GeneratePkgDefFile)' == 'true')" />

<!--
Support for templates.
Support for templates. Generates VSIXSubPath items from information specified by the project in VSTemplate items.
-->
<Target Name="_GetVsixTemplateItems" DependsOnTargets="ZipProjects;ZipItems" Condition="'@(VSTemplate)' != ''">
<Target Name="_GetVsixTemplateItems" Condition="'@(VSTemplate)' != ''">
<!--
Reads information from the files listed in VSTemplate and populates given itemg groups.
Note: TargetPath is nore relevant since we are not actually creating zip file.
-->
<GetVSTemplateItems TemplateFiles="@(VSTemplate)" TargetPath="_">
<Output TaskParameter="ZipItems" ItemName="_ItemTemplates" />
<Output TaskParameter="ZipProjects" ItemName="_ProjectTemplates" />
</GetVSTemplateItems>

<ItemGroup>
<VSIXSourceItem Include="@(IntermediateZipItem)">
<VSIXSubPath>%(IntermediateZipItem.Filename)\%(IntermediateZipItem.Language)\%(IntermediateZipItem.OutputSubPath)\%(IntermediateZipItem.Culture)</VSIXSubPath>
</VSIXSourceItem>
<VSIXSourceItem Include="@(IntermediateZipProject)">
<VSIXSubPath>%(IntermediateZipProject.Filename)\%(IntermediateZipProject.Language)\%(IntermediateZipProject.OutputSubPath)\%(IntermediateZipProject.Culture)</VSIXSubPath>
<_TemplateFile Include="@(_ItemTemplates);@(_ProjectTemplates)">
<_TemplateName>$([System.IO.Path]::GetFileNameWithoutExtension('%(ZipFile)'))</_TemplateName>

<!-- Item file path within the template directory (trim RootPath prefix, if any) -->
<_RelativeFilePath>\%(Identity)</_RelativeFilePath>
<_RelativeFilePath Condition="'%(RootPath)' != '\'">$([MSBuild]::ValueOrDefault('%(Identity)', '').Substring($([MSBuild]::ValueOrDefault('%(RootPath)', '').Length)))</_RelativeFilePath>

<_RelativeDir>$([System.IO.Path]::GetDirectoryName('%(_TemplateFile._RelativeFilePath)'))</_RelativeDir>
</_TemplateFile>
<VSIXSourceItem Include="@(_TemplateFile)" KeepMetadata="VSIXSubPath">
<VSIXSubPath>%(_TemplateName)\%(Language)\%(OutputSubPath)\%(Culture)\%(_TemplateName)%(_RelativeDir)</VSIXSubPath>
</VSIXSourceItem>
</ItemGroup>
</Target>
Expand Down