Skip to content

Commit a8cd189

Browse files
authored
Bump spa-templates SHA to pick up local build fix (#34746)
- see dotnet/spa-templates#7 - restore simpler src/submodules/Directory.Build.* files separately, dotnet/spa-templates#7 helped me fix this repo: - correct syntax in src/ProjectTemplates/build.cmd - fix whitespace src/ProjectTemplates/Directory.Build.targets target added to `$(Description)` - fix typo in the `_AppendRepositoryUrlToPackageDescription` target name
1 parent 08c8b41 commit a8cd189

File tree

6 files changed

+24
-26
lines changed

6 files changed

+24
-26
lines changed

eng/targets/Packaging.targets

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@
2525
</Target>
2626

2727
<PropertyGroup>
28-
<GenerateNuspecDependsOn>$(GenerateNuspecDependsOn);_AppendRepostoryUrlToPackageDescription</GenerateNuspecDependsOn>
28+
<GenerateNuspecDependsOn>$(GenerateNuspecDependsOn);_AppendRepositoryUrlToPackageDescription</GenerateNuspecDependsOn>
2929
</PropertyGroup>
3030

31-
<Target Name="_AppendRepostoryUrlToPackageDescription"
32-
DependsOnTargets="InitializeSourceControlInformation">
31+
<Target Name="_AppendRepositoryUrlToPackageDescription"
32+
DependsOnTargets="InitializeSourceControlInformation">
3333
<PropertyGroup Condition="'$(RepositoryUrl)' != '' AND '$(SourceRevisionId)' != ''">
3434
<PackageDescription>$(PackageDescription)
3535

src/ProjectTemplates/Directory.Build.targets

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
<PropertyGroup>
55
<Description>$(Description)
66

7-
To install the templates in this package, run 'dotnet new --install $(PackageId)::$(PackageVersion)'.
8-
</Description>
7+
To install the templates in this package, run 'dotnet new --install $(PackageId)::$(PackageVersion)'.</Description>
98
</PropertyGroup>
109

1110
<Import Project="GenerateContent.targets" />

src/ProjectTemplates/build.cmd

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
11
@ECHO OFF
22
SET RepoRoot=%~dp0..\..
3-
%RepoRoot%\eng\build.cmd -projects %~dp0*\*.*proj "/p:EnforceE2ETestPrerequisites=true" %*
4-
%RepoRoot%\eng\build.cmd -projects %~dp0\..\submodules\spa-templates\src\*.*proj "/p:EnforceE2ETestPrerequisites=true" -noBuildRepoTasks -noBuildNative %*
3+
CALL "%RepoRoot%\eng\build.cmd" -projects "%~dp0*\*.*proj" "/p:EnforceE2ETestPrerequisites=true" %*
4+
IF %ERRORLEVEL% NEQ 0 (
5+
EXIT /b %ErrorLevel%
6+
)
7+
8+
CALL "%RepoRoot%\eng\build.cmd" -projects "%RepoRoot%\src\submodules\spa-templates\src\*.*proj" "/p:EnforceE2ETestPrerequisites=true" -noBuildRepoTasks -noBuildNative %*
9+
IF %ERRORLEVEL% NEQ 0 (
10+
EXIT /b %ErrorLevel%
11+
)

src/submodules/Directory.Build.props

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
1-
<Project>
2-
<!--
3-
For everything but Microsoft.DotNet.Web.Spa.ProjectTemplates, intentionally break the inheritance chain so
4-
submodules do not inherit build settings from this repo. For Microsoft.DotNet.Web.Spa.ProjectTemplates, break the
5-
build if referenced file does not exist.
6-
-->
7-
<Import Project="..\ProjectTemplates\Directory.Build.props"
8-
Condition=" '$(MSBuildProjectName)' == 'Microsoft.DotNet.Web.Spa.ProjectTemplates' " />
9-
</Project>
1+
<!--
2+
For everything but Microsoft.DotNet.Web.Spa.ProjectTemplates (which bypasses this file), intentionally break
3+
the inheritance chain so submodules do not inherit build settings from this repo.
4+
-->
5+
<Project />
Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
1-
<Project>
2-
<!--
3-
For everything but Microsoft.DotNet.Web.Spa.ProjectTemplates, intentionally break the inheritance chain so
4-
submodules do not inherit build settings from this repo. For Microsoft.DotNet.Web.Spa.ProjectTemplates, break the
5-
build if referenced file does not exist.
6-
-->
7-
<Import Project="..\ProjectTemplates\Directory.Build.targets"
8-
Condition=" '$(MSBuildProjectName)' == 'Microsoft.DotNet.Web.Spa.ProjectTemplates' " />
9-
</Project>
1+
<!--
2+
For everything but Microsoft.DotNet.Web.Spa.ProjectTemplates (which bypasses this file), intentionally break
3+
the inheritance chain so submodules do not inherit build settings from this repo.
4+
-->
5+
<Project />

0 commit comments

Comments
 (0)