Prepare the 2.0.5 patch and add task to ensure repo versions cascade
This commit is contained in:
Nate McMaster
parent
0ade3698b4
commit
88e66f2b21
|
|
@ -68,8 +68,8 @@
|
|||
branch = release/2.0.0
|
||||
[submodule "modules/Mvc"]
|
||||
path = modules/Mvc
|
||||
url = https://github.com/aspnet/Mvc.git
|
||||
branch = release/2.0.0
|
||||
url = https://github.com/aspnet/Mvc-Private.git
|
||||
branch = release/2.0.0-MSRC
|
||||
[submodule "modules/MvcPrecompilation"]
|
||||
path = modules/MvcPrecompilation
|
||||
url = https://github.com/aspnet/MvcPrecompilation.git
|
||||
|
|
@ -169,4 +169,4 @@
|
|||
[submodule "modules/Templating"]
|
||||
path = modules/Templating
|
||||
url = https://github.com/aspnet/Templating-Private.git
|
||||
branch = release/2.0.0
|
||||
branch = release/2.0.0-MSRC
|
||||
|
|
|
|||
|
|
@ -10,67 +10,7 @@
|
|||
</ItemDefinitionGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageArtifact Include="Microsoft.AspNet.Identity.AspNetCoreCompat" Category="noship" />
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.All" Category="ship" LZMA="true" />
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Antiforgery" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.ApplicationInsights.HostingStartup" Category="ship" Metapackage="true" RuntimeStore="true" HostingStartup="true" />
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Authentication.Abstractions" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Authentication.Cookies" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Authentication.Core" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Authentication.Facebook" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Authentication.Google" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Authentication.JwtBearer" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Authentication.OAuth" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Authentication.Twitter" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Authentication" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Authorization.Policy" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Authorization" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Category="ship" Metapackage="true" RuntimeStore="true" HostingStartup="true" />
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension" Category="ship" />
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.AzureAppServicesIntegration" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Buffering" Category="noship" />
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Certificates.Configuration.Sources" Category="noship" />
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.ChunkingCookieManager.Sources" Category="noship" />
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.CookiePolicy" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Cors" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Cryptography.Internal" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.DataProtection.Abstractions" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.DataProtection.AzureStorage" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.DataProtection.Extensions" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.DataProtection.Redis" Category="ship" />
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.DataProtection.SystemWeb" Category="ship" />
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.DataProtection" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Diagnostics.Abstractions" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Diagnostics.Elm" Category="noship" />
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Diagnostics.Identity.Service" Category="noship" />
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Diagnostics" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Hosting.Abstractions" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Hosting.Server.Abstractions" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Hosting.WindowsServices" Category="ship" />
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Hosting" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Http.Abstractions" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Http.Extensions" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Http.Features" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Http" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.HttpOverrides" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Identity.Service.Abstractions" Category="noship" />
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Identity.Service.AzureKeyVault" Category="noship" />
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Identity.Service.Core" Category="noship" />
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore" Category="noship" />
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Identity.Service.IntegratedWebClient" Category="noship" />
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Identity.Service.Mvc" Category="noship" />
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Identity.Service.Specification.Tests" Category="noship" />
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Identity.Service" Category="noship" />
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Identity.Specification.Tests" Category="ship" />
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Identity" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Localization.Routing" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Localization" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.MiddlewareAnalysis" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Mvc.Abstractions" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Mvc.ApiExplorer" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Mvc.Core" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
|
|
@ -79,7 +19,6 @@
|
|||
<PackageArtifact Include="Microsoft.AspNetCore.Mvc.Formatters.Json" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Mvc.Formatters.Xml" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Mvc.Localization" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Mvc.Razor.Extensions" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Mvc.Razor.ViewCompilation" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Mvc.Razor" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Mvc.RazorPages" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
|
|
@ -90,65 +29,11 @@
|
|||
<PackageArtifact Include="Microsoft.AspNetCore.Mvc" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.NodeServices.Sockets" Category="noship" />
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.NodeServices" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Owin" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Proxy" Category="noship" />
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.RangeHelper.Sources" Category="noship" />
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Razor.Language" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Razor.Runtime" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources" Category="noship" />
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Razor" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.ResponseCaching.Abstractions" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.ResponseCaching" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.ResponseCompression" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Rewrite" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Routing.Abstractions" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Routing.DecisionTree.Sources" Category="noship" />
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Routing" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Server.HttpSys" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Server.IISIntegration" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Server.IntegrationTesting" Category="noship" />
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Server.Kestrel.Core" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Server.Kestrel.Https" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets" Category="noship" />
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Server.Kestrel" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.Session" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.SpaServices" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.SpaTemplates" Category="ship" />
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.StaticFiles" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.TestHost" Category="ship" />
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.WebSockets" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore.WebUtilities" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.AspNetCore" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.CodeAnalysis.Razor.Workspaces" Category="shipoob" />
|
||||
<PackageArtifact Include="Microsoft.CodeAnalysis.Razor" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.CodeAnalysis.Remote.Razor" Category="shipoob" />
|
||||
<PackageArtifact Include="Microsoft.DotNet.Web.Client.ItemTemplates" Category="shipoob" />
|
||||
<PackageArtifact Include="Microsoft.DotNet.Web.ItemTemplates" Category="shipoob" />
|
||||
<PackageArtifact Include="Microsoft.DotNet.Web.ProjectTemplates.2.0" Category="shipoob" />
|
||||
<PackageArtifact Include="Microsoft.DotNet.Web.Spa.ProjectTemplates" Category="shipoob" />
|
||||
<PackageArtifact Include="Microsoft.EntityFrameworkCore.Design" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.EntityFrameworkCore.InMemory" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.EntityFrameworkCore.Relational.Design.Specification.Tests" Category="ship" />
|
||||
<PackageArtifact Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Category="ship" />
|
||||
<PackageArtifact Include="Microsoft.EntityFrameworkCore.Relational" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.EntityFrameworkCore.Specification.Tests" Category="ship" />
|
||||
<PackageArtifact Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.EntityFrameworkCore.Sqlite" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.EntityFrameworkCore.SqlServer" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Category="ship" LZMATools="true" />
|
||||
<PackageArtifact Include="Microsoft.EntityFrameworkCore.Tools" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.EntityFrameworkCore" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.Extensions.Hosting.Abstractions" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.Extensions.Identity.Core" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.Extensions.Identity.Stores" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.Extensions.Localization.Abstractions" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.Extensions.Localization" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.Net.Http.Headers" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.Owin.Security.Interop" Category="ship" />
|
||||
<PackageArtifact Include="Microsoft.VisualStudio.LanguageServices.Razor" Category="shipoob" />
|
||||
<PackageArtifact Include="Microsoft.VisualStudio.Web.BrowserLink" Category="ship" Metapackage="true" RuntimeStore="true"/>
|
||||
<PackageArtifact Include="Microsoft.VisualStudio.Web.CodeGeneration.Contracts" Category="ship" />
|
||||
<PackageArtifact Include="Microsoft.VisualStudio.Web.CodeGeneration.Core" Category="ship" />
|
||||
<PackageArtifact Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Category="ship" LZMA="true" />
|
||||
|
|
@ -158,7 +43,5 @@
|
|||
<PackageArtifact Include="Microsoft.VisualStudio.Web.CodeGeneration.Utils" Category="ship" />
|
||||
<PackageArtifact Include="Microsoft.VisualStudio.Web.CodeGeneration" Category="ship" />
|
||||
<PackageArtifact Include="Microsoft.VisualStudio.Web.CodeGenerators.Mvc" Category="ship" />
|
||||
<PackageArtifact Include="Microsoft.Web.Xdt.Extensions" Category="shipoob" />
|
||||
<PackageArtifact Include="RazorPageGenerator" Category="noship" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -28,54 +28,13 @@
|
|||
<!-- .NET Core feed -->
|
||||
<PropertyGroup>
|
||||
<DotNetCoreFeed>https://dotnet.myget.org/F/dotnet-core/api/v3/index.json</DotNetCoreFeed>
|
||||
<CoreSetupPackageVersion>2.0.2-servicing-25728-02</CoreSetupPackageVersion>
|
||||
<MicrosoftNETCorePlatformsPackageVersion>2.0.0</MicrosoftNETCorePlatformsPackageVersion>
|
||||
<CoreSetupPackageVersion>2.0.3</CoreSetupPackageVersion>
|
||||
<MicrosoftNETCorePlatformsPackageVersion>2.0.1</MicrosoftNETCorePlatformsPackageVersion>
|
||||
<MicrosoftNETCoreApp20PackageVersion>$(CoreSetupPackageVersion)</MicrosoftNETCoreApp20PackageVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ExternalDependency Include="System.Memory" Version="4.4.0-preview3-25519-03" Source="$(DotNetCoreFeed)" Mirror="true" />
|
||||
<ExternalDependency Include="Microsoft.NETCore.Platforms" Version="$(MicrosoftNETCorePlatformsPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
|
||||
<ExternalDependency Include="Microsoft.DotNet.PlatformAbstractions" Version="$(CoreSetupPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
|
||||
<ExternalDependency Include="Microsoft.Extensions.DependencyModel" Version="$(CoreSetupPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
|
||||
<ExternalDependency Include="Microsoft.NETCore.App" Version="$(CoreSetupPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" >
|
||||
<VariableName>RuntimeFrameworkVersion</VariableName>
|
||||
<TargetFramework>netcoreapp2.0</TargetFramework>
|
||||
</ExternalDependency>
|
||||
<ExternalDependency Include="Microsoft.NETCore.DotNetAppHost" Version="$(CoreSetupPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
|
||||
<ExternalDependency Include="Microsoft.NETCore.DotNetHost" Version="$(CoreSetupPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
|
||||
<ExternalDependency Include="Microsoft.NETCore.DotNetHostPolicy" Version="$(CoreSetupPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
|
||||
<ExternalDependency Include="Microsoft.NETCore.DotNetHostResolver" Version="$(CoreSetupPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
|
||||
<ExternalDependency Include="runtime.linux-arm.Microsoft.NETCore.App" Version="$(CoreSetupPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
|
||||
<ExternalDependency Include="runtime.linux-arm.Microsoft.NETCore.DotNetAppHost" Version="$(CoreSetupPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
|
||||
<ExternalDependency Include="runtime.linux-arm.Microsoft.NETCore.DotNetHost" Version="$(CoreSetupPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
|
||||
<ExternalDependency Include="runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy" Version="$(CoreSetupPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
|
||||
<ExternalDependency Include="runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver" Version="$(CoreSetupPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
|
||||
<ExternalDependency Include="runtime.linux-x64.Microsoft.NETCore.App" Version="$(CoreSetupPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
|
||||
<ExternalDependency Include="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="$(CoreSetupPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
|
||||
<ExternalDependency Include="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="$(CoreSetupPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
|
||||
<ExternalDependency Include="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="$(CoreSetupPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
|
||||
<ExternalDependency Include="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="$(CoreSetupPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
|
||||
<ExternalDependency Include="runtime.osx-x64.Microsoft.NETCore.App" Version="$(CoreSetupPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
|
||||
<ExternalDependency Include="runtime.osx-x64.Microsoft.NETCore.DotNetAppHost" Version="$(CoreSetupPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
|
||||
<ExternalDependency Include="runtime.osx-x64.Microsoft.NETCore.DotNetHost" Version="$(CoreSetupPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
|
||||
<ExternalDependency Include="runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy" Version="$(CoreSetupPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
|
||||
<ExternalDependency Include="runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver" Version="$(CoreSetupPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
|
||||
<ExternalDependency Include="runtime.rhel.6-x64.Microsoft.NETCore.App" Version="$(CoreSetupPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
|
||||
<ExternalDependency Include="runtime.rhel.6-x64.Microsoft.NETCore.DotNetAppHost" Version="$(CoreSetupPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
|
||||
<ExternalDependency Include="runtime.rhel.6-x64.Microsoft.NETCore.DotNetHost" Version="$(CoreSetupPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
|
||||
<ExternalDependency Include="runtime.rhel.6-x64.Microsoft.NETCore.DotNetHostPolicy" Version="$(CoreSetupPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
|
||||
<ExternalDependency Include="runtime.rhel.6-x64.Microsoft.NETCore.DotNetHostResolver" Version="$(CoreSetupPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
|
||||
<ExternalDependency Include="runtime.win-x64.Microsoft.NETCore.App" Version="$(CoreSetupPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
|
||||
<ExternalDependency Include="runtime.win-x64.Microsoft.NETCore.DotNetAppHost" Version="$(CoreSetupPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
|
||||
<ExternalDependency Include="runtime.win-x64.Microsoft.NETCore.DotNetHost" Version="$(CoreSetupPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
|
||||
<ExternalDependency Include="runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy" Version="$(CoreSetupPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
|
||||
<ExternalDependency Include="runtime.win-x64.Microsoft.NETCore.DotNetHostResolver" Version="$(CoreSetupPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
|
||||
<ExternalDependency Include="runtime.win-x86.Microsoft.NETCore.App" Version="$(CoreSetupPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
|
||||
<ExternalDependency Include="runtime.win-x86.Microsoft.NETCore.DotNetAppHost" Version="$(CoreSetupPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
|
||||
<ExternalDependency Include="runtime.win-x86.Microsoft.NETCore.DotNetHost" Version="$(CoreSetupPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
|
||||
<ExternalDependency Include="runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy" Version="$(CoreSetupPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
|
||||
<ExternalDependency Include="runtime.win-x86.Microsoft.NETCore.DotNetHostResolver" Version="$(CoreSetupPackageVersion)" Source="$(DotNetCoreFeed)" Mirror="true" />
|
||||
<ExternalDependency Include="System.Memory" Version="4.4.0-preview3-25519-03" Source="$(DotNetCoreFeed)" Mirror="false" Private="true" />
|
||||
</ItemGroup>
|
||||
|
||||
<!-- ASP.NET Core Tools feed -->
|
||||
|
|
@ -153,6 +112,53 @@
|
|||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ExternalDependency Include="Microsoft.NETCore.Platforms" Version="$(MicrosoftNETCorePlatformsPackageVersion)" Source="$(DefaultNuGetFeed)" />
|
||||
<ExternalDependency Include="Microsoft.DotNet.PlatformAbstractions" Version="$(CoreSetupPackageVersion)" Source="$(DefaultNuGetFeed)" />
|
||||
<ExternalDependency Include="Microsoft.Extensions.DependencyModel" Version="$(CoreSetupPackageVersion)" Source="$(DefaultNuGetFeed)" />
|
||||
<ExternalDependency Include="Microsoft.NETCore.App" Version="$(CoreSetupPackageVersion)" Source="$(DefaultNuGetFeed)" >
|
||||
<NoWarn>KRB2004</NoWarn>
|
||||
<VariableName>RuntimeFrameworkVersion</VariableName>
|
||||
<TargetFramework>netcoreapp2.0</TargetFramework>
|
||||
</ExternalDependency>
|
||||
<ExternalDependency Include="Microsoft.NETCore.App" Version="$(CoreSetupPackageVersion)" Source="$(DefaultNuGetFeed)" >
|
||||
<NoWarn>KRB2004</NoWarn>
|
||||
<VariableName>MicrosoftNETCoreApp20PackageVersion</VariableName>
|
||||
</ExternalDependency>
|
||||
<ExternalDependency Include="Microsoft.NETCore.DotNetAppHost" Version="$(CoreSetupPackageVersion)" Source="$(DefaultNuGetFeed)" />
|
||||
<ExternalDependency Include="Microsoft.NETCore.DotNetHost" Version="$(CoreSetupPackageVersion)" Source="$(DefaultNuGetFeed)" />
|
||||
<ExternalDependency Include="Microsoft.NETCore.DotNetHostPolicy" Version="$(CoreSetupPackageVersion)" Source="$(DefaultNuGetFeed)" />
|
||||
<ExternalDependency Include="Microsoft.NETCore.DotNetHostResolver" Version="$(CoreSetupPackageVersion)" Source="$(DefaultNuGetFeed)" />
|
||||
<ExternalDependency Include="runtime.linux-arm.Microsoft.NETCore.App" Version="$(CoreSetupPackageVersion)" Source="$(DefaultNuGetFeed)" />
|
||||
<ExternalDependency Include="runtime.linux-arm.Microsoft.NETCore.DotNetAppHost" Version="$(CoreSetupPackageVersion)" Source="$(DefaultNuGetFeed)" />
|
||||
<ExternalDependency Include="runtime.linux-arm.Microsoft.NETCore.DotNetHost" Version="$(CoreSetupPackageVersion)" Source="$(DefaultNuGetFeed)" />
|
||||
<ExternalDependency Include="runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy" Version="$(CoreSetupPackageVersion)" Source="$(DefaultNuGetFeed)" />
|
||||
<ExternalDependency Include="runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver" Version="$(CoreSetupPackageVersion)" Source="$(DefaultNuGetFeed)" />
|
||||
<ExternalDependency Include="runtime.linux-x64.Microsoft.NETCore.App" Version="$(CoreSetupPackageVersion)" Source="$(DefaultNuGetFeed)" />
|
||||
<ExternalDependency Include="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="$(CoreSetupPackageVersion)" Source="$(DefaultNuGetFeed)" />
|
||||
<ExternalDependency Include="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="$(CoreSetupPackageVersion)" Source="$(DefaultNuGetFeed)" />
|
||||
<ExternalDependency Include="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="$(CoreSetupPackageVersion)" Source="$(DefaultNuGetFeed)" />
|
||||
<ExternalDependency Include="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="$(CoreSetupPackageVersion)" Source="$(DefaultNuGetFeed)" />
|
||||
<ExternalDependency Include="runtime.osx-x64.Microsoft.NETCore.App" Version="$(CoreSetupPackageVersion)" Source="$(DefaultNuGetFeed)" />
|
||||
<ExternalDependency Include="runtime.osx-x64.Microsoft.NETCore.DotNetAppHost" Version="$(CoreSetupPackageVersion)" Source="$(DefaultNuGetFeed)" />
|
||||
<ExternalDependency Include="runtime.osx-x64.Microsoft.NETCore.DotNetHost" Version="$(CoreSetupPackageVersion)" Source="$(DefaultNuGetFeed)" />
|
||||
<ExternalDependency Include="runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy" Version="$(CoreSetupPackageVersion)" Source="$(DefaultNuGetFeed)" />
|
||||
<ExternalDependency Include="runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver" Version="$(CoreSetupPackageVersion)" Source="$(DefaultNuGetFeed)" />
|
||||
<ExternalDependency Include="runtime.rhel.6-x64.Microsoft.NETCore.App" Version="$(CoreSetupPackageVersion)" Source="$(DefaultNuGetFeed)" />
|
||||
<ExternalDependency Include="runtime.rhel.6-x64.Microsoft.NETCore.DotNetAppHost" Version="$(CoreSetupPackageVersion)" Source="$(DefaultNuGetFeed)" />
|
||||
<ExternalDependency Include="runtime.rhel.6-x64.Microsoft.NETCore.DotNetHost" Version="$(CoreSetupPackageVersion)" Source="$(DefaultNuGetFeed)" />
|
||||
<ExternalDependency Include="runtime.rhel.6-x64.Microsoft.NETCore.DotNetHostPolicy" Version="$(CoreSetupPackageVersion)" Source="$(DefaultNuGetFeed)" />
|
||||
<ExternalDependency Include="runtime.rhel.6-x64.Microsoft.NETCore.DotNetHostResolver" Version="$(CoreSetupPackageVersion)" Source="$(DefaultNuGetFeed)" />
|
||||
<ExternalDependency Include="runtime.win-x64.Microsoft.NETCore.App" Version="$(CoreSetupPackageVersion)" Source="$(DefaultNuGetFeed)" />
|
||||
<ExternalDependency Include="runtime.win-x64.Microsoft.NETCore.DotNetAppHost" Version="$(CoreSetupPackageVersion)" Source="$(DefaultNuGetFeed)" />
|
||||
<ExternalDependency Include="runtime.win-x64.Microsoft.NETCore.DotNetHost" Version="$(CoreSetupPackageVersion)" Source="$(DefaultNuGetFeed)" />
|
||||
<ExternalDependency Include="runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy" Version="$(CoreSetupPackageVersion)" Source="$(DefaultNuGetFeed)" />
|
||||
<ExternalDependency Include="runtime.win-x64.Microsoft.NETCore.DotNetHostResolver" Version="$(CoreSetupPackageVersion)" Source="$(DefaultNuGetFeed)" />
|
||||
<ExternalDependency Include="runtime.win-x86.Microsoft.NETCore.App" Version="$(CoreSetupPackageVersion)" Source="$(DefaultNuGetFeed)" />
|
||||
<ExternalDependency Include="runtime.win-x86.Microsoft.NETCore.DotNetAppHost" Version="$(CoreSetupPackageVersion)" Source="$(DefaultNuGetFeed)" />
|
||||
<ExternalDependency Include="runtime.win-x86.Microsoft.NETCore.DotNetHost" Version="$(CoreSetupPackageVersion)" Source="$(DefaultNuGetFeed)" />
|
||||
<ExternalDependency Include="runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy" Version="$(CoreSetupPackageVersion)" Source="$(DefaultNuGetFeed)" />
|
||||
<ExternalDependency Include="runtime.win-x86.Microsoft.NETCore.DotNetHostResolver" Version="$(CoreSetupPackageVersion)" Source="$(DefaultNuGetFeed)" />
|
||||
|
||||
<ExternalDependency Include="Libuv" Version="1.10.0" Source="$(DefaultNuGetFeed)" />
|
||||
<ExternalDependency Include="BenchmarkDotNet" Version="0.10.3" Source="$(DefaultNuGetFeed)" Private="true"/>
|
||||
<ExternalDependency Include="EntityFramework" Version="6.1.3" Source="$(DefaultNuGetFeed)" Private="true" />
|
||||
|
|
@ -290,6 +296,116 @@ not building again in this patch.
|
|||
-->
|
||||
|
||||
<!-- Shipped dependencies from previous builds -->
|
||||
|
||||
<!-- 2.0.1 -->
|
||||
<ItemGroup>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.Antiforgery" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.ApplicationInsights.HostingStartup" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" HostingStartup="true" />
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.Authentication.Abstractions" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.Authentication.Cookies" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.Authentication.Core" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.Authentication.Facebook" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.Authentication.Google" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.Authentication.OAuth" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.Authentication.Twitter" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.Authentication" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.Authorization.Policy" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.Authorization" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" HostingStartup="true" />
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension" Version="2.0.1" Source="$(DefaultNuGetFeed)" />
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.CookiePolicy" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.Cors" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.Cryptography.Internal" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.DataProtection.Abstractions" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.DataProtection.AzureStorage" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.DataProtection.Extensions" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.DataProtection.Redis" Version="0.3.1" Source="$(DefaultNuGetFeed)" />
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.DataProtection.SystemWeb" Version="2.0.1" Source="$(DefaultNuGetFeed)" />
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.DataProtection" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.Diagnostics.Abstractions" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.Diagnostics" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.Hosting.Server.Abstractions" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.Hosting.WindowsServices" Version="2.0.1" Source="$(DefaultNuGetFeed)" />
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.Hosting" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.Http.Extensions" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.Http.Features" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.Http" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.HttpOverrides" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.Identity.Specification.Tests" Version="2.0.1" Source="$(DefaultNuGetFeed)" />
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.Identity" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.Localization.Routing" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.Localization" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.MiddlewareAnalysis" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.Owin" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.Razor.Language" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.Razor.Runtime" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.Razor" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.ResponseCaching.Abstractions" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.ResponseCaching" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.ResponseCompression" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.Rewrite" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.Routing.Abstractions" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.Routing" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.Server.HttpSys" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.Server.IISIntegration" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.Server.Kestrel.Core" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.Server.Kestrel.Https" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.Session" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.SpaTemplates" Version="2.0.3" Source="$(DefaultNuGetFeed)" />
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.TestHost" Version="2.0.1" Source="$(DefaultNuGetFeed)" />
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.WebSockets" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.WebUtilities" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.CodeAnalysis.Razor" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.EntityFrameworkCore.Design" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.EntityFrameworkCore.InMemory" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.EntityFrameworkCore.Relational.Design.Specification.Tests" Version="2.0.1" Source="$(DefaultNuGetFeed)" />
|
||||
<ExternalDependency Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="2.0.1" Source="$(DefaultNuGetFeed)" />
|
||||
<ExternalDependency Include="Microsoft.EntityFrameworkCore.Relational" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.EntityFrameworkCore.Specification.Tests" Version="2.0.1" Source="$(DefaultNuGetFeed)" />
|
||||
<ExternalDependency Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="2.0.1" Source="$(DefaultNuGetFeed)" LZMATools="true" />
|
||||
<ExternalDependency Include="Microsoft.EntityFrameworkCore.Tools" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.EntityFrameworkCore" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.Extensions.Hosting.Abstractions" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.Extensions.Identity.Core" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.Extensions.Identity.Stores" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.Extensions.Localization.Abstractions" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.Extensions.Localization" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.Net.Http.Headers" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.Owin.Security.Interop" Version="2.0.1" Source="$(DefaultNuGetFeed)" />
|
||||
<ExternalDependency Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
</ItemGroup>
|
||||
|
||||
<!-- Shipoob packages from the previous build -->
|
||||
<!--
|
||||
<PackageArtifact Include="Microsoft.CodeAnalysis.Razor.Workspaces" Category="shipoob" />
|
||||
<PackageArtifact Include="Microsoft.CodeAnalysis.Remote.Razor" Category="shipoob" />
|
||||
<PackageArtifact Include="Microsoft.DotNet.Web.Client.ItemTemplates" Category="shipoob" />
|
||||
<PackageArtifact Include="Microsoft.DotNet.Web.ItemTemplates" Category="shipoob" />
|
||||
<PackageArtifact Include="Microsoft.DotNet.Web.ProjectTemplates.2.0" Category="shipoob" />
|
||||
<PackageArtifact Include="Microsoft.DotNet.Web.Spa.ProjectTemplates" Category="shipoob" />
|
||||
<PackageArtifact Include="Microsoft.VisualStudio.LanguageServices.Razor" Category="shipoob" />
|
||||
<PackageArtifact Include="Microsoft.Web.Xdt.Extensions" Category="shipoob" />
|
||||
-->
|
||||
|
||||
<!-- 2.0.0 -->
|
||||
<ItemGroup>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.Html.Abstractions" Version="2.0.0" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.JsonPatch" Version="2.0.0" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
|
||||
|
|
@ -338,9 +454,24 @@ not building again in this patch.
|
|||
|
||||
<!-- Non-shipped dependencies from previous builds -->
|
||||
<PropertyGroup>
|
||||
<AspNetCoreMasterFeed>https://dotnet.myget.org/F/aspnetcore-master/api/v3/index.json</AspNetCoreMasterFeed>
|
||||
<AspNetCoreOct2017Patch>https://dotnet.myget.org/F/aspnet-2-0-2-october2017-patch-public/api/v3/index.json</AspNetCoreOct2017Patch>
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- 2.0.1 -->
|
||||
<ItemGroup>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.Certificates.Configuration.Sources" Version="2.0.1-rtm-207" Source="$(AspNetCoreOct2017Patch)" Private="true" Mirror="true" />
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.ChunkingCookieManager.Sources" Version="2.0.1-rtm-207" Source="$(AspNetCoreOct2017Patch)" Private="true" Mirror="true" />
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.RangeHelper.Sources" Version="2.0.1-rtm-207" Source="$(AspNetCoreOct2017Patch)" Private="true" Mirror="true" />
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources" Version="2.0.1-rtm-207" Source="$(AspNetCoreOct2017Patch)" Private="true" Mirror="true" />
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.Routing.DecisionTree.Sources" Version="2.0.1-rtm-207" Source="$(AspNetCoreOct2017Patch)" Private="true" Mirror="true" />
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.Server.IntegrationTesting" Version="0.4.1-rtm-207" Source="$(AspNetCoreOct2017Patch)" Private="true" Mirror="true" />
|
||||
<ExternalDependency Include="RazorPageGenerator" Version="2.0.1-rtm-207" Source="$(AspNetCoreOct2017Patch)" Private="true" Mirror="true" />
|
||||
</ItemGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<AspNetCoreMasterFeed>https://dotnet.myget.org/F/aspnetcore-master/api/v3/index.json</AspNetCoreMasterFeed>
|
||||
</PropertyGroup>
|
||||
<!-- 2.0.0 -->
|
||||
<ItemGroup>
|
||||
<ExternalDependency Include="Microsoft.AspNetCore.Testing" Version="2.0.0" Source="$(AspNetCoreMasterFeed)" Private="true" Mirror="true" />
|
||||
<ExternalDependency Include="Microsoft.Extensions.ActivatorUtilities.Sources" Version="2.0.0" Source="$(AspNetCoreMasterFeed)" Private="true" Mirror="true" />
|
||||
|
|
|
|||
|
|
@ -142,6 +142,12 @@
|
|||
</Target>
|
||||
|
||||
<Target Name="ComputeGraph" DependsOnTargets="ResolveRepoInfo;GeneratePropsFiles">
|
||||
<RepoTasks.CheckRepoGraph
|
||||
Solutions="@(Solution)"
|
||||
Artifacts="@(ArtifactInfo);@(ShippedArtifactInfo)"
|
||||
Repositories="@(Repository);@(ShippedRepository)"
|
||||
Properties="Configuration=$(Configuration);BuildNumber=$(BuildNumber);DotNetPackageVersionPropsPath=$(GeneratedPackageVersionPropsPath);DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcesPropsPath)" />
|
||||
|
||||
<RepoTasks.AnalyzeBuildGraph
|
||||
Solutions="@(Solution)"
|
||||
Artifacts="@(ArtifactInfo)"
|
||||
|
|
|
|||
|
|
@ -1,53 +1,59 @@
|
|||
<Project>
|
||||
<ItemDefinitionGroup>
|
||||
<Repository>
|
||||
<Build>true</Build>
|
||||
</Repository>
|
||||
</ItemDefinitionGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<!-- Repos being patched -->
|
||||
<Repository Include="Antiforgery" />
|
||||
<Repository Include="AzureIntegration" />
|
||||
<Repository Include="BasicMiddleware" />
|
||||
<Repository Include="BrowserLink" />
|
||||
<Repository Include="CORS" />
|
||||
<Repository Include="DataProtection" />
|
||||
<Repository Include="Diagnostics" />
|
||||
<Repository Include="EntityFrameworkCore" />
|
||||
<Repository Include="Hosting" />
|
||||
<Repository Include="HttpAbstractions" />
|
||||
<Repository Include="HttpSysServer" />
|
||||
<Repository Include="Identity" />
|
||||
<Repository Include="IISIntegration" />
|
||||
<Repository Include="JavaScriptServices" />
|
||||
<Repository Include="KestrelHttpServer" />
|
||||
<Repository Include="Localization" />
|
||||
<Repository Include="MetaPackages" />
|
||||
<Repository Include="Mvc" />
|
||||
<Repository Include="MvcPrecompilation" />
|
||||
<Repository Include="Proxy" />
|
||||
<Repository Include="Razor" />
|
||||
<Repository Include="ResponseCaching" />
|
||||
<Repository Include="Routing" />
|
||||
<Repository Include="Scaffolding" />
|
||||
<Repository Include="Security" />
|
||||
<Repository Include="ServerTests" />
|
||||
<Repository Include="Session" />
|
||||
<Repository Include="StaticFiles" />
|
||||
<Repository Include="WebSockets" />
|
||||
|
||||
<!--
|
||||
Repos not building this patch.
|
||||
Build tools will *verify* that these repos will be unaffected
|
||||
by the patch update and do not need updating.
|
||||
-->
|
||||
<ShippedRepository Include="Antiforgery" />
|
||||
<ShippedRepository Include="AzureIntegration" />
|
||||
<ShippedRepository Include="BasicMiddleware" />
|
||||
<ShippedRepository Include="BrowserLink" />
|
||||
<ShippedRepository Include="Caching" />
|
||||
<ShippedRepository Include="Common" />
|
||||
<ShippedRepository Include="Configuration" />
|
||||
<ShippedRepository Include="CORS" />
|
||||
<ShippedRepository Include="DataProtection" />
|
||||
<ShippedRepository Include="DependencyInjection" />
|
||||
<ShippedRepository Include="Diagnostics" />
|
||||
<ShippedRepository Include="DotNetTools" />
|
||||
<ShippedRepository Include="EntityFrameworkCore" />
|
||||
<ShippedRepository Include="EventNotification" />
|
||||
<ShippedRepository Include="FileSystem" />
|
||||
<ShippedRepository Include="Hosting" />
|
||||
<ShippedRepository Include="HtmlAbstractions" />
|
||||
<ShippedRepository Include="HttpAbstractions" />
|
||||
<ShippedRepository Include="HttpSysServer" />
|
||||
<ShippedRepository Include="Identity" />
|
||||
<ShippedRepository Include="IISIntegration" />
|
||||
<ShippedRepository Include="JsonPatch" />
|
||||
<ShippedRepository Include="KestrelHttpServer" />
|
||||
<ShippedRepository Include="Localization" />
|
||||
<ShippedRepository Include="Logging" />
|
||||
<ShippedRepository Include="MetaPackages" />
|
||||
<ShippedRepository Include="Microsoft.Data.Sqlite" />
|
||||
<ShippedRepository Include="Options" />
|
||||
<ShippedRepository Include="Proxy" />
|
||||
<ShippedRepository Include="Razor" />
|
||||
<ShippedRepository Include="ResponseCaching" />
|
||||
<ShippedRepository Include="Routing" />
|
||||
<ShippedRepository Include="Security" />
|
||||
<ShippedRepository Include="ServerTests" />
|
||||
<ShippedRepository Include="Session" />
|
||||
<ShippedRepository Include="StaticFiles" />
|
||||
<ShippedRepository Include="Testing" />
|
||||
<ShippedRepository Include="WebSockets" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -59,9 +59,12 @@ namespace RepoTasks
|
|||
var factory = new SolutionInfoFactory(Log, BuildEngine5);
|
||||
var props = MSBuildListSplitter.GetNamedProperties(Properties);
|
||||
|
||||
Log.LogMessage(MessageImportance.High, $"Beginning cross-repo analysis on {Solutions.Length} solutions. Hang tight...");
|
||||
if (!props.TryGetValue("Configuration", out var defaultConfig))
|
||||
{
|
||||
defaultConfig = "Debug";
|
||||
}
|
||||
|
||||
var solutions = factory.Create(Solutions, props, _cts.Token);
|
||||
var solutions = factory.Create(Solutions, props, defaultConfig, _cts.Token);
|
||||
Log.LogMessage($"Found {solutions.Count} and {solutions.Sum(p => p.Projects.Count)} projects");
|
||||
|
||||
if (_cts.IsCancellationRequested)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,214 @@
|
|||
// Copyright (c) .NET Foundation. All rights reserved.
|
||||
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
|
||||
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.IO;
|
||||
using System.Text;
|
||||
using System.Threading;
|
||||
using Microsoft.Build.Framework;
|
||||
using Microsoft.Build.Utilities;
|
||||
using NuGet.Frameworks;
|
||||
using NuGet.Packaging.Core;
|
||||
using NuGet.Versioning;
|
||||
using RepoTools.BuildGraph;
|
||||
using RepoTasks.ProjectModel;
|
||||
using RepoTasks.Utilities;
|
||||
|
||||
namespace RepoTasks
|
||||
{
|
||||
public class CheckRepoGraph : Task, ICancelableTask
|
||||
{
|
||||
private readonly CancellationTokenSource _cts = new CancellationTokenSource();
|
||||
|
||||
[Required]
|
||||
public ITaskItem[] Solutions { get; set; }
|
||||
|
||||
[Required]
|
||||
public ITaskItem[] Artifacts { get; set; }
|
||||
|
||||
[Required]
|
||||
public ITaskItem[] Repositories { get; set; }
|
||||
|
||||
[Required]
|
||||
public string Properties { get; set; }
|
||||
|
||||
public void Cancel()
|
||||
{
|
||||
_cts.Cancel();
|
||||
}
|
||||
|
||||
public override bool Execute()
|
||||
{
|
||||
var packageArtifacts = Artifacts.Select(ArtifactInfo.Parse)
|
||||
.OfType<ArtifactInfo.Package>()
|
||||
.Where(p => !p.IsSymbolsArtifact)
|
||||
.ToDictionary(p => p.PackageInfo.Id, p => p, StringComparer.OrdinalIgnoreCase);
|
||||
|
||||
var factory = new SolutionInfoFactory(Log, BuildEngine5);
|
||||
var props = MSBuildListSplitter.GetNamedProperties(Properties);
|
||||
|
||||
if (!props.TryGetValue("Configuration", out var defaultConfig))
|
||||
{
|
||||
defaultConfig = "Debug";
|
||||
}
|
||||
|
||||
var solutions = factory.Create(Solutions, props, defaultConfig, _cts.Token).OrderBy(f => f.Directory).ToList();
|
||||
Log.LogMessage($"Found {solutions.Count} and {solutions.Sum(p => p.Projects.Count)} projects");
|
||||
|
||||
if (_cts.IsCancellationRequested)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
var repoGraph = new AdjacencyMatrix(solutions.Count);
|
||||
var packageToProjectMap = new Dictionary<PackageIdentity, ProjectInfo>();
|
||||
|
||||
for (var i = 0; i < solutions.Count; i++)
|
||||
{
|
||||
var sln = repoGraph[i] = solutions[i];
|
||||
|
||||
foreach (var proj in sln.Projects)
|
||||
{
|
||||
if (!proj.IsPackable
|
||||
|| proj.FullPath.Contains("samples")
|
||||
|| proj.FullPath.Contains("tools/Microsoft.VisualStudio.Web.CodeGeneration.Design"))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
var id = new PackageIdentity(proj.PackageId, new NuGetVersion(proj.PackageVersion));
|
||||
|
||||
if (packageToProjectMap.TryGetValue(id, out var otherProj))
|
||||
{
|
||||
Log.LogError($"Both {proj.FullPath} and {otherProj.FullPath} produce {id}");
|
||||
continue;
|
||||
}
|
||||
|
||||
packageToProjectMap.Add(id, proj);
|
||||
}
|
||||
|
||||
var sharedSrc = Path.Combine(sln.Directory, "shared");
|
||||
if (Directory.Exists(sharedSrc))
|
||||
{
|
||||
foreach (var dir in Directory.GetDirectories(sharedSrc, "*.Sources"))
|
||||
{
|
||||
var id = GetDirectoryName(dir);
|
||||
var artifactInfo = packageArtifacts[id];
|
||||
var sharedSrcProj = new ProjectInfo(dir,
|
||||
Array.Empty<ProjectFrameworkInfo>(),
|
||||
Array.Empty<DotNetCliReferenceInfo>(),
|
||||
true,
|
||||
artifactInfo.PackageInfo.Id,
|
||||
artifactInfo.PackageInfo.Version.ToNormalizedString());
|
||||
sharedSrcProj.SolutionInfo = sln;
|
||||
var identity = new PackageIdentity(artifactInfo.PackageInfo.Id, artifactInfo.PackageInfo.Version);
|
||||
packageToProjectMap.Add(identity, sharedSrcProj);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (Log.HasLoggedErrors)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
for (var i = 0; i < solutions.Count; i++)
|
||||
{
|
||||
var src = repoGraph[i];
|
||||
|
||||
foreach (var proj in src.Projects)
|
||||
{
|
||||
if (!proj.IsPackable
|
||||
|| proj.FullPath.Contains("samples"))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
foreach (var dep in proj.Frameworks.SelectMany(f => f.Dependencies.Values))
|
||||
{
|
||||
if (packageToProjectMap.TryGetValue(new PackageIdentity(dep.Id, new NuGetVersion(dep.Version)), out var target))
|
||||
{
|
||||
var j = repoGraph.FindIndex(target.SolutionInfo);
|
||||
repoGraph.SetLink(i, j);
|
||||
}
|
||||
}
|
||||
|
||||
foreach (var toolDep in proj.Tools)
|
||||
{
|
||||
if (packageToProjectMap.TryGetValue(new PackageIdentity(toolDep.Id, new NuGetVersion(toolDep.Version)), out var target))
|
||||
{
|
||||
var j = repoGraph.FindIndex(target.SolutionInfo);
|
||||
repoGraph.SetLink(i, j);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
var repos = Repositories.ToDictionary(i => i.ItemSpec, i => i, StringComparer.OrdinalIgnoreCase);
|
||||
|
||||
for (var i = 0; i < repoGraph.Count; i++)
|
||||
{
|
||||
var src = repoGraph[i];
|
||||
var repoName = GetDirectoryName(src.Directory);
|
||||
var repo = repos[repoName];
|
||||
|
||||
for (var j = 0; j < repoGraph.Count; j++)
|
||||
{
|
||||
if (j == i) continue;
|
||||
if (repoGraph.HasLink(i, j))
|
||||
{
|
||||
var target = repoGraph[j];
|
||||
var targetRepoName = GetDirectoryName(target.Directory);
|
||||
var targetRepo = repos[targetRepoName];
|
||||
|
||||
if (src.Shipped && !target.Shipped)
|
||||
{
|
||||
Log.LogError($"{repoName} cannot depend on {targetRepoName}. Repos marked as 'Shipped' cannot depend on repos that are rebuilding. Update the configuration in submodule.props.");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return !Log.HasLoggedErrors;
|
||||
}
|
||||
|
||||
private static string GetDirectoryName(string path)
|
||||
=> Path.GetFileName(path.TrimEnd(new[] { '\\', '/' }));
|
||||
|
||||
private class AdjacencyMatrix
|
||||
{
|
||||
private readonly bool[,] _matrix;
|
||||
private readonly SolutionInfo[] _items;
|
||||
|
||||
public AdjacencyMatrix(int size)
|
||||
{
|
||||
_matrix = new bool[size, size];
|
||||
_items = new SolutionInfo[size];
|
||||
Count = size;
|
||||
}
|
||||
|
||||
public SolutionInfo this[int idx]
|
||||
{
|
||||
get => _items[idx];
|
||||
set => _items[idx] = value;
|
||||
}
|
||||
|
||||
public int FindIndex(SolutionInfo item)
|
||||
{
|
||||
return Array.FindIndex(_items, t => t.Equals(item));
|
||||
}
|
||||
|
||||
public int Count { get; }
|
||||
|
||||
public bool HasLink(int source, int target) => _matrix[source, target];
|
||||
|
||||
public void SetLink(int source, int target)
|
||||
{
|
||||
_matrix[source, target] = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -10,7 +10,6 @@ namespace RepoTasks.ProjectModel
|
|||
internal class ProjectInfo
|
||||
{
|
||||
public ProjectInfo(string fullPath,
|
||||
string projectExtensionsPath,
|
||||
IReadOnlyList<ProjectFrameworkInfo> frameworks,
|
||||
IReadOnlyList<DotNetCliReferenceInfo> tools,
|
||||
bool isPackable,
|
||||
|
|
@ -28,7 +27,6 @@ namespace RepoTasks.ProjectModel
|
|||
FullPath = fullPath;
|
||||
FileName = Path.GetFileName(fullPath);
|
||||
Directory = Path.GetDirectoryName(FullPath);
|
||||
ProjectExtensionsPath = projectExtensionsPath ?? Path.Combine(Directory, "obj");
|
||||
IsPackable = isPackable;
|
||||
PackageId = packageId;
|
||||
PackageVersion = packageVersion;
|
||||
|
|
@ -36,7 +34,6 @@ namespace RepoTasks.ProjectModel
|
|||
|
||||
public string FullPath { get; }
|
||||
public string FileName { get; }
|
||||
public string ProjectExtensionsPath { get; }
|
||||
public string Directory { get; }
|
||||
public string PackageId { get; }
|
||||
public string PackageVersion { get; }
|
||||
|
|
@ -44,5 +41,6 @@ namespace RepoTasks.ProjectModel
|
|||
|
||||
public IReadOnlyList<ProjectFrameworkInfo> Frameworks { get; }
|
||||
public IReadOnlyList<DotNetCliReferenceInfo> Tools { get; }
|
||||
public SolutionInfo SolutionInfo { get; internal set; }
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,7 +27,6 @@ namespace RepoTasks.ProjectModel
|
|||
{
|
||||
var project = GetProject(path, projectCollection);
|
||||
var instance = project.CreateProjectInstance(ProjectInstanceSettings.ImmutableWithFastItemLookup);
|
||||
var projExtPath = instance.GetPropertyValue("MSBuildProjectExtensionsPath");
|
||||
|
||||
var targetFrameworks = instance.GetPropertyValue("TargetFrameworks");
|
||||
var targetFramework = instance.GetPropertyValue("TargetFramework");
|
||||
|
|
@ -59,11 +58,17 @@ namespace RepoTasks.ProjectModel
|
|||
|
||||
var tools = GetTools(instance).ToArray();
|
||||
bool.TryParse(instance.GetPropertyValue("IsPackable"), out var isPackable);
|
||||
|
||||
if (isPackable)
|
||||
{
|
||||
// the default packable setting is disabled for projects referencing this package.
|
||||
isPackable = !frameworks.SelectMany(f => f.Dependencies.Keys).Any(d => d.Equals("Microsoft.NET.Test.Sdk", StringComparison.OrdinalIgnoreCase));
|
||||
}
|
||||
|
||||
var packageId = instance.GetPropertyValue("PackageId");
|
||||
var packageVersion = instance.GetPropertyValue("PackageVersion");
|
||||
|
||||
return new ProjectInfo(path,
|
||||
projExtPath,
|
||||
frameworks,
|
||||
tools,
|
||||
isPackable,
|
||||
|
|
@ -88,6 +93,8 @@ namespace RepoTasks.ProjectModel
|
|||
var globalProps = new Dictionary<string, string>()
|
||||
{
|
||||
["DesignTimeBuild"] = "true",
|
||||
// Isolate the project from post-restore side effects
|
||||
["ExcludeRestorePackageImports"] = "true",
|
||||
};
|
||||
|
||||
var project = new Project(xml,
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
|
||||
namespace RepoTasks.ProjectModel
|
||||
{
|
||||
|
|
@ -20,13 +21,20 @@ namespace RepoTasks.ProjectModel
|
|||
throw new ArgumentException(nameof(configName));
|
||||
}
|
||||
|
||||
Directory = Path.GetDirectoryName(fullPath);
|
||||
FullPath = fullPath;
|
||||
ConfigName = configName;
|
||||
Projects = projects ?? throw new ArgumentNullException(nameof(projects));
|
||||
ShouldBuild = shouldBuild;
|
||||
Shipped = shipped;
|
||||
|
||||
foreach (var proj in Projects)
|
||||
{
|
||||
proj.SolutionInfo = this;
|
||||
}
|
||||
}
|
||||
|
||||
public string Directory { get; }
|
||||
public string FullPath { get; }
|
||||
public string ConfigName { get; }
|
||||
public IReadOnlyList<ProjectInfo> Projects { get; }
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ namespace RepoTasks.ProjectModel
|
|||
_buildEngine = buildEngine;
|
||||
}
|
||||
|
||||
public IReadOnlyList<SolutionInfo> Create(IEnumerable<ITaskItem> solutionItems, IDictionary<string, string> properties, CancellationToken ct)
|
||||
public IReadOnlyList<SolutionInfo> Create(IEnumerable<ITaskItem> solutionItems, IDictionary<string, string> properties, string defaultConfig, CancellationToken ct)
|
||||
{
|
||||
var timer = Stopwatch.StartNew();
|
||||
|
||||
|
|
@ -49,7 +49,7 @@ namespace RepoTasks.ProjectModel
|
|||
|
||||
if (solutionProps.TryGetValue("Configuration", out var configName))
|
||||
{
|
||||
solutionProps["Configuration"] = configName = "Debug";
|
||||
solutionProps["Configuration"] = configName = defaultConfig;
|
||||
}
|
||||
|
||||
var key = $"SlnInfo:{solutionFile}:{configName}";
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
</PropertyGroup>
|
||||
|
||||
<UsingTask TaskName="RepoTasks.AnalyzeBuildGraph" AssemblyFile="$(_RepoTaskAssembly)" />
|
||||
<UsingTask TaskName="RepoTasks.CheckRepoGraph" AssemblyFile="$(_RepoTaskAssembly)" />
|
||||
<UsingTask TaskName="RepoTasks.CopyPackagesToSplitFolders" AssemblyFile="$(_RepoTaskAssembly)" />
|
||||
<UsingTask TaskName="RepoTasks.DownloadNuGetPackages" AssemblyFile="$(_RepoTaskAssembly)" />
|
||||
<UsingTask TaskName="RepoTasks.GeneratePackageVersionPropsFile" AssemblyFile="$(_RepoTaskAssembly)" />
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit 8c47b90677c0f544844151418ba94f24d9f2a094
|
||||
Subproject commit becf1df9c5a3b908e28ec3c1272b072d8801e3dc
|
||||
|
|
@ -1 +1 @@
|
|||
Subproject commit 64389a9bbeda7378c80b4c302700ddcb78d4f0aa
|
||||
Subproject commit d5a664e4817a395cbafec942387162b5afeba7bf
|
||||
|
|
@ -1 +1 @@
|
|||
Subproject commit f8789f5d5c4d5869490a05b8f7250b6151f1673e
|
||||
Subproject commit 7cea779b7a744a3d915aa207a760f6f7b9c6dccc
|
||||
|
|
@ -1 +1 @@
|
|||
Subproject commit bc58d8495a431d3de606afc52c2987d1ebf1e6ad
|
||||
Subproject commit f510e7034000e346f6771197d30aaf791ce2bf48
|
||||
|
|
@ -1 +1 @@
|
|||
Subproject commit 26822d4c876ee6203014eaf6df398c874c4535ea
|
||||
Subproject commit 069ca2612999a49e2b19099f21d8196f422c82de
|
||||
|
|
@ -1 +1 @@
|
|||
Subproject commit 3a4c81dcc99fbfcb14d73994ac6255f6eced7ac1
|
||||
Subproject commit 16c23b846ec57803e83c7e1bffc9c24546fe1de4
|
||||
Loading…
Reference in New Issue