huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Clean up #12854 a bit 

- remove incorrect comment
- do not completely overwrite `$(RestoreAdditionalProjectSources)` values
This commit is contained in:
Doug Bunting 2019-08-06 10:47:56 -07:00
parent 92977140ac
commit b1fdf27f61
4 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NuGet.config
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- Keep this file in sync with src/ProjectTemplates/test/Infrastructure/NuGet.config.in. -->
<configuration> <configuration>
<packageSources> <packageSources>
<clear /> <clear />

2
src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets
View File

@ -6,7 +6,7 @@
Condition="$(DesignTimeBuild) != true"> Condition="$(DesignTimeBuild) != true">
<PropertyGroup> <PropertyGroup>
<PropsProperties> <PropsProperties>
RestoreAdditionalProjectSources=$([MSBuild]::Escape("$(ArtifactsShippingPackagesDir);$(ArtifactsNonShippingPackagesDir)")); RestoreAdditionalProjectSources=$([MSBuild]::Escape("$(RestoreAdditionalProjectSources);$(ArtifactsShippingPackagesDir);$(ArtifactsNonShippingPackagesDir)"));
MicrosoftNetCompilersToolsetPackageVersion=$(MicrosoftNetCompilersToolsetPackageVersion); MicrosoftNetCompilersToolsetPackageVersion=$(MicrosoftNetCompilersToolsetPackageVersion);
MicrosoftNETCoreAppRuntimeVersion=$(MicrosoftNETCoreAppRuntimeVersion); MicrosoftNETCoreAppRuntimeVersion=$(MicrosoftNETCoreAppRuntimeVersion);
MicrosoftNETCoreAppRefPackageVersion=$(MicrosoftNETCoreAppRefPackageVersion); MicrosoftNETCoreAppRefPackageVersion=$(MicrosoftNETCoreAppRefPackageVersion);

2
src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj
View File

@ -17,7 +17,7 @@
<NoSemVer20>true</NoSemVer20> <NoSemVer20>true</NoSemVer20>
<!-- Grab packages LB.csproj should have just built. --> <!-- Grab packages LB.csproj should have just built. -->
<RestoreAdditionalProjectSources>$(ArtifactsNonShippingPackagesDir)</RestoreAdditionalProjectSources> <RestoreAdditionalProjectSources>$(RestoreAdditionalProjectSources);$(ArtifactsNonShippingPackagesDir)</RestoreAdditionalProjectSources>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

1
src/SiteExtensions/Sdk/SiteExtension.targets
View File

@ -15,6 +15,7 @@
<_RuntimeStoreManifestFile>$(_DepsOutputDirectory)\rs.csproj</_RuntimeStoreManifestFile> <_RuntimeStoreManifestFile>$(_DepsOutputDirectory)\rs.csproj</_RuntimeStoreManifestFile>
<_RuntimeStoreOutput>$(_DepsOutputDirectory)\rs\</_RuntimeStoreOutput> <_RuntimeStoreOutput>$(_DepsOutputDirectory)\rs\</_RuntimeStoreOutput>
<_RsRestoreSources> <_RsRestoreSources>
$(RestoreAdditionalProjectSources);
$(ArtifactsShippingPackagesDir); $(ArtifactsShippingPackagesDir);
$(ArtifactsNonShippingPackagesDir) $(ArtifactsNonShippingPackagesDir)
</_RsRestoreSources> </_RsRestoreSources>