Skip to content

Commit d0b51b4

Browse files
committed
Clean up #12854 a bit
- remove incorrect comment - do not completely overwrite `$(RestoreAdditionalProjectSources)` values
1 parent 7e59a26 commit d0b51b4

File tree

4 files changed

+3
-3
lines changed

4 files changed

+3
-3
lines changed

NuGet.config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!-- Keep this file in sync with src/ProjectTemplates/test/Infrastructure/NuGet.config.in. -->
32
<configuration>
43
<packageSources>
54
<clear />

src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
Condition="$(DesignTimeBuild) != true">
77
<PropertyGroup>
88
<PropsProperties>
9-
RestoreAdditionalProjectSources=$([MSBuild]::Escape("$(ArtifactsShippingPackagesDir);$(ArtifactsNonShippingPackagesDir)"));
9+
RestoreAdditionalProjectSources=$([MSBuild]::Escape("$(RestoreAdditionalProjectSources);$(ArtifactsShippingPackagesDir);$(ArtifactsNonShippingPackagesDir)"));
1010
MicrosoftNetCompilersToolsetPackageVersion=$(MicrosoftNetCompilersToolsetPackageVersion);
1111
MicrosoftNETCoreAppRuntimeVersion=$(MicrosoftNETCoreAppRuntimeVersion);
1212
MicrosoftNETCoreAppRefPackageVersion=$(MicrosoftNETCoreAppRefPackageVersion);

src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<NoSemVer20>true</NoSemVer20>
1818

1919
<!-- Grab packages LB.csproj should have just built. -->
20-
<RestoreAdditionalProjectSources>$(ArtifactsNonShippingPackagesDir)</RestoreAdditionalProjectSources>
20+
<RestoreAdditionalProjectSources>$(RestoreAdditionalProjectSources);$(ArtifactsNonShippingPackagesDir)</RestoreAdditionalProjectSources>
2121
</PropertyGroup>
2222

2323
<ItemGroup>

src/SiteExtensions/Sdk/SiteExtension.targets

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<_RuntimeStoreManifestFile>$(_DepsOutputDirectory)\rs.csproj</_RuntimeStoreManifestFile>
1616
<_RuntimeStoreOutput>$(_DepsOutputDirectory)\rs\</_RuntimeStoreOutput>
1717
<_RsRestoreSources>
18+
$(RestoreAdditionalProjectSources);
1819
$(ArtifactsShippingPackagesDir);
1920
$(ArtifactsNonShippingPackagesDir)
2021
</_RsRestoreSources>

0 commit comments

Comments
 (0)