Skip to content

Commit 7348fc7

Browse files
author
Alan Wu
authored
Lay foundation for VSIX localization and re-enable Single-project MSIX Packaging templates (#1341)
* Add back project templates for Single-project MSIX Packaging, and lay groundwork for localization (split into separate Dev16 and Dev17 extensions) * Extract strings from .vstemplate into .resx
1 parent b90ccdf commit 7348fc7

51 files changed

Lines changed: 1633 additions & 1545 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -386,5 +386,4 @@ build/override/
386386

387387
# WindowsAppSDK specific files
388388
Microsoft.WinUI.AppX.targets
389-
dev/vsix/extension/LICENSE
390389
!dev/vsix/**/*.pubxml

dev/VSIX/Directory.Build.props

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,29 @@
77
https://pkgs.dev.azure.com/microsoft/ProjectReunion/_packaging/Project.Reunion.nuget.internal/nuget/v3/index.json
88
</RestoreSources>
99
<CppWinRTVersion Condition="'$(CppWinRTVersion)' == ''">2.0.210806.1</CppWinRTVersion>
10-
<WindowsAppSdkVersion Condition="'$(WindowsAppSdkVersion)' == ''">0.5.7</WindowsAppSdkVersion>
10+
<WindowsSDKBuildToolsVersion Condition="'$(WindowsSDKBuildToolsVersion)' == ''">10.0.20348.19</WindowsSDKBuildToolsVersion>
11+
<WindowsAppSdkVersion Condition="'$(WindowsAppSdkVersion)' == ''">1.0.0-experimental1</WindowsAppSdkVersion>
1112
<Deployment Condition="'$(Deployment)' == '' ">Standalone</Deployment>
1213
</PropertyGroup>
1314

15+
<!-- Useful folder paths -->
1416
<PropertyGroup>
17+
<RepoRoot>$(MSBuildThisFileDirectory)..\..\</RepoRoot>
18+
<VSIXRootDir>$(MSBuildThisFileDirectory)</VSIXRootDir>
19+
<ExtensionDir>$(VSIXRootDir)Extension\</ExtensionDir>
20+
<ItemTemplatesDir>$(VSIXRootDir)ItemTemplates\</ItemTemplatesDir>
21+
<ProjectTemplatesDir>$(VSIXRootDir)ProjectTemplates\</ProjectTemplatesDir>
22+
</PropertyGroup>
23+
24+
<PropertyGroup>
25+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
26+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
1527
<EnableDefaultNoneItems>false</EnableDefaultNoneItems>
1628
<MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
1729
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
1830
<VSIXBuild>true</VSIXBuild>
1931
<RuntimeIdentifiers>win</RuntimeIdentifiers>
32+
<SolutionDir Condition="!Exists('$(SolutionDir)')">$(MSBuildThisFileDirectory)</SolutionDir>
2033
<BuildOutput Condition="'$(BuildOutput)' == ''">$(SolutionDir)BuildOutput\</BuildOutput>
2134
<BuildOutputRoot>$(BuildOutput)obj\$(Platform)$(Configuration)\$(Deployment)\</BuildOutputRoot>
2235
<BaseIntermediateOutputPath>$(BuildOutputRoot)$(MSBuildProjectName)\</BaseIntermediateOutputPath>

dev/VSIX/Directory.Build.targets

Lines changed: 0 additions & 198 deletions
This file was deleted.

0 commit comments

Comments
 (0)