diff --git a/build/Publish.targets b/build/Publish.targets
index 37a6a8ff2b..d36fc0a363 100644
--- a/build/Publish.targets
+++ b/build/Publish.targets
@@ -3,7 +3,7 @@
$(RepositoryRoot).deps\assets\
$(RepositoryRoot).deps\packages\
- $(RepositoryRoot).deps\symbols\
+ $(RepositoryRoot).deps\mirror\
aspnetcore_base_runtime.version
$(IntermediateDir)$(BaseRuntimeVersionFileName)
@@ -17,6 +17,7 @@
CopyToPublishArtifacts;
PublishToAzureFeed;
PublishToTransportFeed;
+ PublishToMyGet;
@@ -68,14 +69,12 @@
-
+
$(BlobBasePath)$(SymbolsArchiveBaseFileName)-%(RuntimeSymbolsArchive.Identity)%(RuntimeSymbolsArchive.FileExt)
ShipInstaller=dotnetcli
-
-
$(BlobBasePath)$(PackageArchiveFileName)
@@ -124,33 +123,61 @@
true
- <_Artifact
+
+
+
+ <_PackageArtifactInfo
Include="@(ArtifactInfo)"
ArtifactPath="$(DependencyPackagesDir)%(ArtifactInfo.PackageId).%(ArtifactInfo.Version).nupkg"
Condition="'%(ArtifactInfo.ArtifactType)' == 'NuGetPackage'" />
+
+ <_SymbolsPackageArtifactInfo
+ Include="@(ArtifactInfo)"
+ ArtifactPath="$(DependencyPackagesDir)%(ArtifactInfo.PackageId).%(ArtifactInfo.Version).symbols.nupkg"
+ Condition="'%(ArtifactInfo.ArtifactType)' == 'NuGetSymbolsPackage'" />
+
+
+
-
+
- <_MissingPackages Include="@(PackageArtifact)" />
- <_MissingPackages Remove="%(PackagesToPublish.PackageId)" />
+ <_MissingPackageArtifact Include="@(PackageArtifact)" />
+ <_MissingPackageArtifact Remove="%(_PackageArtifactInfoWithCategory.PackageId)" />
-
+
+
+
+
+
+
+
+
+
- <_MissingFiles Include="%(FilesToPublish.Identity)" Condition="!Exists(%(FilesToPublish.Identity))" />
- <_MissingFiles Include="%(PackagesToPublish.ArtifactPath)" Condition="!Exists(%(PackagesToPublish.ArtifactPath))" />
+ <_MissingArtifactFile Include="@(FilesToPublish)" Condition="!Exists(%(FilesToPublish.Identity))" />
+ <_MissingArtifactFile Include="@(NpmPackageToPublish)" Condition="!Exists(%(NpmPackageToPublish.Identity))" />
+ <_MissingArtifactFile Include="@(PackageToMirror)" Condition="!Exists(%(PackageToMirror.Identity))" />
+ <_MissingArtifactFile Include="@(PackageToPublish)" Condition="!Exists(%(PackageToPublish.Identity))" />
-
+
+
@@ -158,6 +185,48 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(PublishMyGetNpmRegistryUrl.Replace("https:", "")):_authToken
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -186,12 +255,12 @@
Condition="'$(PublishToTransportFeed)' == 'true'">
-
-
@@ -202,19 +271,19 @@
Condition=" '%(FilesToPublish.IsDuplicateUpload)' != 'true' " />
-
+
+ Condition="@(PackageToPublish->Count()) != 0" />
+
+
diff --git a/build/repo.props b/build/repo.props
index 3f4d8c4a5c..42bc8d2b2f 100644
--- a/build/repo.props
+++ b/build/repo.props
@@ -12,7 +12,6 @@
false
$(RepositoryRoot)modules\
- $([MSBuild]::NormalizeDirectory($(ArtifactsDir)))lineups\
$(RepositoryRoot).deps\build\
$(RepositoryRoot).deps\mirror\
@@ -49,9 +48,13 @@
FeedCredential="$(DotNetAssetRootAccessTokenSuffix)" />
+
+
+ true
true
+
true
diff --git a/build/repo.targets b/build/repo.targets
index a1df07ce3f..64b63fc490 100644
--- a/build/repo.targets
+++ b/build/repo.targets
@@ -22,11 +22,11 @@
$(PackageDependsOn);BuildMetapackages;BuildTemplates;SplitPackages
$(TestDependsOn);_TestRepositories
$(VerifyDependsOn);VerifyCoherentVersions
- $(GetArtifactInfoDependsOn);ResolveRepoInfo
+ $(GetArtifactInfoDependsOn);ResolveRepoInfo;GetLineupPackageInfo
-
+
@@ -88,12 +88,22 @@
-
+
+
+
+ NuGetPackage
+ Internal.AspNetCore.Universe.Lineup
+ $(Version)
+ noship
+ true
+
+
+
+
+
<_LineupPackages Include="@(ExternalDependency)" />
<_LineupPackages Include="%(ArtifactInfo.PackageId)" Version="%(ArtifactInfo.Version)" Condition=" '%(ArtifactInfo.ArtifactType)' == 'NuGetPackage' " />
- <_LineupPackages Include="Microsoft.AspNetCore.All" Version="$(PackageVersion)" />
- <_LineupPackages Include="Microsoft.AspNetCore.App" Version="$(PackageVersion)" />
<_RestoreSources Include="$(DotNetAdditionalRestoreSources)" Condition="'$(DotNetAdditionalRestoreSources)' != ''" />
<_RestoreSources Include="$(DependencyPackageDir)" Condition="'$(DependencyPackageDir)' != '' AND Exists('$(DependencyPackageDir)')" />
@@ -113,7 +123,7 @@
OutputPath="$(GeneratedRestoreSourcesPropsPath)" />
diff --git a/build/tasks/AnalyzeBuildGraph.cs b/build/tasks/AnalyzeBuildGraph.cs
index 5a49e5945d..2d9c88c315 100644
--- a/build/tasks/AnalyzeBuildGraph.cs
+++ b/build/tasks/AnalyzeBuildGraph.cs
@@ -196,7 +196,7 @@ namespace RepoTasks
};
var packages = artifacts
- .Where(a => a.RepoName.Equals(repoName, StringComparison.OrdinalIgnoreCase))
+ .Where(a => string.Equals(a.RepoName, repoName, StringComparison.OrdinalIgnoreCase))
.ToDictionary(p => p.PackageInfo.Id, p => p, StringComparer.OrdinalIgnoreCase);
foreach (var proj in s.Projects)
diff --git a/korebuild.json b/korebuild.json
index bd5d51a51b..a7d496a8ad 100644
--- a/korebuild.json
+++ b/korebuild.json
@@ -1,4 +1,10 @@
{
"$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/dev/tools/korebuild.schema.json",
- "channel": "dev"
+ "channel": "dev",
+ "toolsets": {
+ "nodejs": {
+ "minVersion": "8.0",
+ "required": true
+ }
+ }
}