diff --git a/README.md b/README.md index c14247ba29..24a41d7554 100644 --- a/README.md +++ b/README.md @@ -15,15 +15,15 @@ All published ASP.NET Core packages can be found on . This feed may include +Packages can be found on . This feed may include packages that will not be supported in a officially released build. Commonly referenced packages: -[app-metapackage-myget]: https://dotnet.myget.org/feed/aspnetcore-dev/package/nuget/Microsoft.AspNetCore.App -[app-metapackage-myget-badge]: http://img.shields.io/dotnet.myget/aspnetcore-dev/v/Microsoft.AspNetCore.App.svg?style=flat-square&label=myget +[app-metapackage-myget]: https://dotnet.myget.org/feed/dotnet-core/package/nuget/Microsoft.AspNetCore.App +[app-metapackage-myget-badge]: http://img.shields.io/dotnet.myget/dotnet-core/v/Microsoft.AspNetCore.App.svg?style=flat-square&label=myget -[metapackage-myget]: https://dotnet.myget.org/feed/aspnetcore-dev/package/nuget/Microsoft.AspNetCore -[metapackage-myget-badge]: http://img.shields.io/dotnet.myget/aspnetcore-dev/v/Microsoft.AspNetCore.svg?style=flat-square&label=myget +[metapackage-myget]: https://dotnet.myget.org/feed/dotnet-core/package/nuget/Microsoft.AspNetCore +[metapackage-myget-badge]: http://img.shields.io/dotnet.myget/dotnet-core/v/Microsoft.AspNetCore.svg?style=flat-square&label=myget Package | MyGet :---------------------------------|:--------------------------------------------------------- diff --git a/build/AzureIntegration.targets b/build/AzureIntegration.targets index 7cf8a507fb..8df9536eb7 100644 --- a/build/AzureIntegration.targets +++ b/build/AzureIntegration.targets @@ -3,7 +3,7 @@ $(MSBuildThisFileDirectory)..\modules\AzureIntegration\ - + AspNetUniverseBuildOffline=true; diff --git a/build/PackageArchive.targets b/build/PackageArchive.targets index d01ed8cf94..666cade766 100644 --- a/build/PackageArchive.targets +++ b/build/PackageArchive.targets @@ -33,7 +33,6 @@ <_FallbackArchiveRestoreSources Include="$(MetapackageRestoreSource)" Condition="Exists($(MetapackageRestoreSource))" /> - <_FallbackArchiveRestoreSources Include="$(DependencyMirrorPackageDir)" Condition="Exists($(DependencyMirrorPackageDir))" /> $(RepositoryRoot).deps\assets\ $(RepositoryRoot).deps\packages\ - $(RepositoryRoot).deps\mirror\ aspnetcore_base_runtime.version $(IntermediateDir)$(BaseRuntimeVersionFileName) @@ -124,9 +123,6 @@ - - <_PackageArtifactInfo Include="@(ArtifactInfo)" ArtifactPath="$(DependencyPackagesDir)%(ArtifactInfo.PackageId).%(ArtifactInfo.Version).nupkg" @@ -172,7 +168,6 @@ <_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))" /> @@ -195,7 +190,6 @@ - diff --git a/build/external-dependencies.props b/build/external-dependencies.props index 1b1f1cdaee..e235eb847f 100644 --- a/build/external-dependencies.props +++ b/build/external-dependencies.props @@ -5,14 +5,10 @@ - - false - - false false @@ -20,354 +16,220 @@ - - - https://dotnet.myget.org/F/dotnet-core/api/v3/index.json - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - KRB2004 - MicrosoftNETCoreApp21PackageVersion - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - https://dotnet.myget.org/F/roslyn/api/v3/index.json - - - - - - KRB2004 - VSIX_MicrosoftCodeAnalysisPackageVersion - - - KRB2004 - VSIX_MicrosoftCodeAnalysisCommonPackageVersion - - - KRB2004 - VSIX_MicrosoftCodeAnalysisCSharpPackageVersion - - - KRB2004 - VSIX_MicrosoftCodeAnalysisCSharpFeaturesPackageVersion - - - KRB2004 - VSIX_MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion - - - KRB2004 - VSIX_MicrosoftCodeAnalysisFeaturesPackageVersion - - - KRB2004 - VSIX_MicrosoftCodeAnalysisVisualBasicPackageVersion - - - KRB2004 - VSIX_MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion - - - KRB2004 - VSIX_MicrosoftCodeAnalysisWorkspacesCommonPackageVersion - - - KRB2004 - VSIX_MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion - - - KRB2004 - VSIX_MicrosoftCodeAnalysisRemoteRazorServiceHubPackageVersion - - - KRB2004 - VSIX_MicrosoftCodeAnalysisRemoteWorkspacesPackageVersion - - - KRB2004 - VSIX_MicrosoftVisualStudioLanguageServicesRazorRemoteClientPackageVersion - - - KRB2004 - VSIX_MicrosoftVisualStudioLanguageServicesPackageVersion - - - - - https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json - - - - - - - - - - https://vside.myget.org/F/vssdk/api/v3/index.json - - - - - - - - - - - - - https://vside.myget.org/F/vsmac/api/v3/index.json - - - - - - - https://www.myget.org/F/xunit/api/v3/index.json - - - - - - - https://api.nuget.org/v3/index.json - - - - - - - - - - - - - - - - - - - - - - - KRB2004 - - - KRB2004 - - - KRB2004 - - - KRB2004 - - - KRB2004 - - - KRB2004 - - - KRB2004 - - - KRB2004 - - - KRB2004 - - - KRB2004 - - - - - - - - - KRB2004 - MicrosoftNETCoreApp10PackageVersion - - - - KRB2004 - MicrosoftNETCoreApp11PackageVersion - - - - KRB2004 - MicrosoftNETCoreApp20PackageVersion - - - - - - - - - - - KRB2004 - - - - - - - - - - - - - - - - - - - - KRB2004 - NETStandard16PackageVersion - - - - KRB2004 - NETStandardLibrary20PackageVersion - - - - - KRB2004 - - - - KRB2004 - VisualStudio_NewtonsoftJsonPackageVersion - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/repo.props b/build/repo.props index b6a1959ae3..9377e7b874 100644 --- a/build/repo.props +++ b/build/repo.props @@ -3,7 +3,6 @@ true false - false public @@ -14,7 +13,6 @@ $(RepositoryRoot)modules\ $(RepositoryRoot).deps\build\ - $(RepositoryRoot).deps\mirror\ @@ -57,6 +55,7 @@ true + diff --git a/build/repo.targets b/build/repo.targets index a6b946587e..7bc96da045 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -8,16 +8,12 @@ - - $(IntermediateDir)mirror\ - - $(IntermediateDir)ext\ $(IntermediateDir)dependencies.g.props $(IntermediateDir)sources.g.props SetTeamCityBuildNumberToVersion;$(PrepareDependsOn);VerifyPackageArtifactConfig;VerifyExternalDependencyConfig;PrepareOutputPaths $(CleanDependsOn);CleanArtifacts;CleanUniverseArtifacts - $(RestoreDependsOn);InstallDotNet;RestoreExternalDependencies + $(RestoreDependsOn);InstallDotNet $(CompileDependsOn);BuildRepositories $(PackageDependsOn);BuildMetapackages;BuildTemplates;SplitPackages $(TestDependsOn);_TestRepositories @@ -26,17 +22,7 @@ - - - - - - - + @@ -102,11 +88,9 @@ <_LineupPackages Include="@(ExternalDependency)" /> <_LineupPackages Include="%(ArtifactInfo.PackageId)" Version="%(ArtifactInfo.Version)" Condition=" '%(ArtifactInfo.ArtifactType)' == 'NuGetPackage' " /> - <_RestoreSources Include="$(DotNetAdditionalRestoreSources)" Condition="'$(DotNetAdditionalRestoreSources)' != ''" /> <_RestoreSources Include="$(DependencyPackageDir)" Condition="'$(DependencyPackageDir)' != '' AND Exists('$(DependencyPackageDir)')" /> <_RestoreSources Include="$(BuildDir)" /> - <_RestoreSources Include="$(IntermediateExternalPackageDir)" /> - <_RestoreSources Include="$(IntermediateMirrorPackageDir)" /> + <_RestoreSources Include="$(RestoreSources)" /> - - <_MirroredPackageFiles Include="$(IntermediateMirrorPackageDir)*.nupkg" /> diff --git a/build/sources.props b/build/sources.props new file mode 100644 index 0000000000..2d82aa8abd --- /dev/null +++ b/build/sources.props @@ -0,0 +1,20 @@ + + + $(DotNetAdditionalRestoreSources) + + $(RestoreSources); + https://api.nuget.org/v3/index.json; + + + $(RestoreSources); + https://dotnet.myget.org/F/dotnet-core/api/v3/index.json; + https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json; + https://dotnet.myget.org/F/aspnetcore-master/api/v3/index.json; + https://dotnet.myget.org/F/roslyn/api/v3/index.json; + https://vside.myget.org/F/vssdk/api/v3/index.json; + https://vside.myget.org/F/vsmac/api/v3/index.json; + https://www.myget.org/F/xunit/api/v3/index.json; + https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json; + + + diff --git a/build/tasks/AnalyzeBuildGraph.cs b/build/tasks/AnalyzeBuildGraph.cs index 2d9c88c315..f62afa76ce 100644 --- a/build/tasks/AnalyzeBuildGraph.cs +++ b/build/tasks/AnalyzeBuildGraph.cs @@ -100,12 +100,7 @@ namespace RepoTasks { dependencyMap[dep.ItemSpec] = versions = new List(); } - else if (dep.GetMetadata("NoWarn") == null || dep.GetMetadata("NoWarn").IndexOf("KRB" + KoreBuildErrors.MultipleExternalDependencyVersions) < 0) - { - Log.LogKoreBuildWarning( - KoreBuildErrors.MultipleExternalDependencyVersions, - message: $"Multiple versions of external dependency '{dep.ItemSpec}' are defined. In most cases, there should only be one version of external dependencies."); - } + versions.Add(dep.GetMetadata("Version")); } diff --git a/build/tasks/CopyPackagesToSplitFolders.cs b/build/tasks/CopyPackagesToSplitFolders.cs index b9ead3f5b6..22f2f24df4 100644 --- a/build/tasks/CopyPackagesToSplitFolders.cs +++ b/build/tasks/CopyPackagesToSplitFolders.cs @@ -76,9 +76,6 @@ namespace RepoTasks case PackageCategory.ShipOob: destDir = Path.Combine(DestinationFolder, "shipoob"); break; - case PackageCategory.Mirror: - destDir = Path.Combine(DestinationFolder, "mirror"); - break; case PackageCategory.Symbols: destDir = Path.Combine(DestinationFolder, "symbols"); break; diff --git a/build/tasks/RepoTasks.csproj b/build/tasks/RepoTasks.csproj index aeff655cbf..8c6e10cb3a 100644 --- a/build/tasks/RepoTasks.csproj +++ b/build/tasks/RepoTasks.csproj @@ -1,10 +1,10 @@ + netstandard2.0 - https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json diff --git a/build/tasks/Utilities/KoreBuildErrors.cs b/build/tasks/Utilities/KoreBuildErrors.cs index f21bde3436..8386f9cf7f 100644 --- a/build/tasks/Utilities/KoreBuildErrors.cs +++ b/build/tasks/Utilities/KoreBuildErrors.cs @@ -15,7 +15,6 @@ namespace RepoTasks.Utilities public const int RepoVersionDoesNotMatchProjectVersion = 2001; public const int RepoPackageVersionDoesNotMatchProjectPackageVersion = 2002; public const int DuplicatePackageReference = 2003; - public const int MultipleExternalDependencyVersions = 2004; // NuGet errors public const int InvalidNuspecFile = 4001; diff --git a/build/tasks/Utilities/PackageCategory.cs b/build/tasks/Utilities/PackageCategory.cs index 78afe9cbce..19a871d3b6 100644 --- a/build/tasks/Utilities/PackageCategory.cs +++ b/build/tasks/Utilities/PackageCategory.cs @@ -10,7 +10,6 @@ namespace RepoTasks.Utilities Shipping, NoShip, ShipOob, - Mirror, Symbols, } } diff --git a/build/tasks/Utilities/PackageCollection.cs b/build/tasks/Utilities/PackageCollection.cs index d066360f53..4aa778aa2a 100644 --- a/build/tasks/Utilities/PackageCollection.cs +++ b/build/tasks/Utilities/PackageCollection.cs @@ -47,9 +47,6 @@ namespace RepoTasks.Utilities case "shipoob": category = PackageCategory.ShipOob; break; - case "mirror": - category = PackageCategory.Mirror; - break; default: category = PackageCategory.Unknown; break; diff --git a/build/tools/templates/Archive/Archive.csproj b/build/tools/templates/Archive/Archive.csproj index 5c25bc8c1d..d5d5c9401f 100644 --- a/build/tools/templates/Archive/Archive.csproj +++ b/build/tools/templates/Archive/Archive.csproj @@ -6,17 +6,6 @@ netcoreapp2.1 false netcoreapp2.1 - $(DotNetRestoreSources) - $(RestoreSources);https://dotnet.myget.org/F/dotnet-core/api/v3/index.json; - - $(RestoreSources); - https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json; - https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json; - - - $(RestoreSources); - https://api.nuget.org/v3/index.json; - diff --git a/build/tools/templates/SharedFx/SharedFx.csproj b/build/tools/templates/SharedFx/SharedFx.csproj index e9ff3b20dd..39bc5fb971 100644 --- a/build/tools/templates/SharedFx/SharedFx.csproj +++ b/build/tools/templates/SharedFx/SharedFx.csproj @@ -6,17 +6,6 @@ netcoreapp2.1 true true - $(DotNetRestoreSources) - - $(RestoreSources); - https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json; - https://dotnet.myget.org/F/aspnetcore-master/api/v3/index.json; - https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json; - - - $(RestoreSources); - https://api.nuget.org/v3/index.json; - diff --git a/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj b/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj index 252ff6be55..6df70d6f22 100644 --- a/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj +++ b/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj @@ -3,17 +3,6 @@ - $(DotNetRestoreSources) - - $(RestoreSources); - https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json; - https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json; - - - $(RestoreSources); - https://api.nuget.org/v3/index.json; - - false false netcoreapp2.1 diff --git a/src/Microsoft.AspNetCore.Analyzers/Microsoft.AspNetCore.Analyzers.csproj b/src/Microsoft.AspNetCore.Analyzers/Microsoft.AspNetCore.Analyzers.csproj index ec46fa5dac..5927d10ad9 100644 --- a/src/Microsoft.AspNetCore.Analyzers/Microsoft.AspNetCore.Analyzers.csproj +++ b/src/Microsoft.AspNetCore.Analyzers/Microsoft.AspNetCore.Analyzers.csproj @@ -3,17 +3,6 @@ - $(DotNetRestoreSources) - - $(RestoreSources); - https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json; - https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json; - - - $(RestoreSources); - https://api.nuget.org/v3/index.json; - - false false netstandard2.0 diff --git a/src/Microsoft.AspNetCore.App/Microsoft.AspNetCore.App.csproj b/src/Microsoft.AspNetCore.App/Microsoft.AspNetCore.App.csproj index bba0f0f8bc..d87e940d0c 100644 --- a/src/Microsoft.AspNetCore.App/Microsoft.AspNetCore.App.csproj +++ b/src/Microsoft.AspNetCore.App/Microsoft.AspNetCore.App.csproj @@ -3,17 +3,6 @@ - $(DotNetRestoreSources) - - $(RestoreSources); - https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json; - https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json; - - - $(RestoreSources); - https://api.nuget.org/v3/index.json; - - false false netcoreapp2.1