diff --git a/Directory.Build.props b/Directory.Build.props
index 30d821eb0dd1..b235a5fa0880 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -9,6 +9,9 @@
.NET Foundation
© Microsoft Corporation. All rights reserved.
en-US
+
+
+
https://raw.githubusercontent.com/aspnet/AspNetCore/2.0.0/LICENSE.txt
Apache-2.0
@@ -28,19 +31,28 @@
true
true
- $(MSBuildThisFileDirectory)
- https://github.com/aspnet/AspNetCore
- git
+ false
+ true
$(Product) $(PackageVersion) Shared Framework
Shared Framework for hosting of Microsoft ASP.NET Core applications. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub ($(RepositoryUrl)). We happily accept issues and PRs.
-
+
+
+ $(MSBuildThisFileDirectory)
+ https://github.com/aspnet/AspNetCore
+ git
+ $(MSBuildThisFileDirectory)src\Shared\
+ $(RepositoryRoot)src\submodules\googletest\
+
+
+
$(MSBuildThisFileDirectory)eng\AspNetCore.snk
true
true
+ Debug
SHA256
@@ -64,34 +76,23 @@
-
+
- $(RepositoryRoot)artifacts\
+ $(MSBuildThisFileDirectory)artifacts\
$(ArtifactsDir)obj\
- Debug
$(ArtifactsDir)$(Configuration)\
- $(ArtifactsConfigurationDir)bin\
- $(ArtifactsConfigurationDir)installers\
$(ArtifactsDir)build\
+ $(ArtifactsConfigurationDir)installers\
+
+
+
$([MSBuild]::MakeRelative($(RepositoryRoot), $(MSBuildProjectDirectory)))
true
true
true
true
-
- false
- true
-
- $(MSBuildThisFileDirectory)src\Shared\
- $(RepositoryRoot)src\submodules\googletest\
-
- true
-
-
-
- netcoreapp2.2;net461
diff --git a/build/dependencies.props b/build/dependencies.props
index 2b61b59cd9fd..dddf86abfa80 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -173,37 +173,12 @@
5.3.0
5.3.0
2.1.1
- 1.0.12
- 1.1.9
- 2.0.9
- 2.1.3
- 2.2.0-rtm-27105-02
- $(MicrosoftNETCoreApp21PackageVersion)
- $(MicrosoftNETCoreApp22PackageVersion)
1.0.1
1.0.0-alpha-004
15.6.1
3.0.1
3.0.1
3.0.1
- 15.8.525
- 16.0.142-g25b7188c54
- 15.8.28010
- 16.0.142-g25b7188c54
- 16.0.142-g25b7188c54
- 7.10.6071
- 16.0.201-pre-g7d366164d0
- 2.0.6142705
- 16.0.201-pre-g7d366164d0
- 15.8.28010
- 10.0.30320
- 11.0.61031
- 12.0.30111
- 8.0.50728
- 9.0.30730
- 7.10.6072
- 16.0.142-g25b7188c54
- 15.8.168
11.1.0
1.4.0
1.3.8
@@ -232,16 +207,6 @@
4.5.0
1.3.7
9.0.1
- 2.11.0-beta1-63430-03
- 2.11.0-beta1-63430-03
- 2.11.0-beta1-63430-03
- 2.11.0-beta1-63430-03
- 2.11.0-beta1-63430-03
- 2.11.0-beta1-63430-03
- 2.11.0-beta1-63430-03
- 2.11.0-beta1-63430-03
- 2.11.0-beta1-63430-03
- 2.11.0-beta1-63430-03
8.1.4
2.0.1
0.10.0
diff --git a/build/external-dependencies.props b/build/external-dependencies.props
index ad5393f3e716..499c5a029b94 100644
--- a/build/external-dependencies.props
+++ b/build/external-dependencies.props
@@ -101,16 +101,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -158,26 +143,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/build/repo.targets b/build/repo.targets
index 9fde303fed33..a33916c3d671 100644
--- a/build/repo.targets
+++ b/build/repo.targets
@@ -13,7 +13,6 @@
$(IntermediateDir)dependencies.g.props
$(IntermediateDir)sources.g.props
- $(IntermediateDir)branding.g.props
SetTeamCityBuildNumberToVersion;$(PrepareDependsOn)
$(PrepareDependsOn);VerifyPackageArtifactConfig;VerifyExternalDependencyConfig;PrepareOutputPaths
@@ -93,9 +92,6 @@
$(BuildProperties);MicrosoftNETCoreAppPackageVersion=$(MicrosoftNETCoreAppPackageVersion);
$(DesignTimeBuildProps);MicrosoftNETCoreApp30PackageVersion=$(MicrosoftNETCoreApp30PackageVersion);
- $(DesignTimeBuildProps);MicrosoftNETCoreApp22PackageVersion=$(MicrosoftNETCoreApp22PackageVersion);
- $(DesignTimeBuildProps);MicrosoftNETCoreApp21PackageVersion=$(MicrosoftNETCoreApp21PackageVersion);
- $(DesignTimeBuildProps);MicrosoftNETCoreApp20PackageVersion=$(MicrosoftNETCoreApp20PackageVersion);
@@ -215,27 +211,6 @@
Sources="@(_RestoreSources)"
OutputPath="$(GeneratedRestoreSourcesPropsPath)" />
-
-
-
-
-
-
- $(AspNetCoreMajorVersion)
- $(AspNetCoreMinorVersion)
- $(AspNetCorePatchVersion)
- $(PreReleaseLabel)
- $(BuildNumber)
- $(PackageBrandingVersion)
-
-
-]]>
-
-
-
-
-
@@ -258,10 +233,6 @@
-
-
-
-
<_UndeclaredPackageArtifact Include="%(ArtifactInfo.PackageId)" Condition="'%(ArtifactInfo.ArtifactType)' == 'NuGetPackage'" />
@@ -309,11 +280,6 @@
-
-
-
-
+ DependsOnTargets="ComputeGraph;VerifyPackageArtifactConfig" />
diff --git a/build/runtimes.props b/build/runtimes.props
index 95bbefcd5f75..469097305ff9 100644
--- a/build/runtimes.props
+++ b/build/runtimes.props
@@ -5,10 +5,6 @@
Feed="$(DotNetAssetRootUrl)"
FeedCredential="$(DotNetAssetRootAccessTokenSuffix)" />
-
-
-
-
- $(MicrosoftNETCoreApp22PackageVersion)
- $(NETStandardLibrary20PackageVersion)
-
- 99.9
+ $(MicrosoftNETCoreAppPackageVersion)
diff --git a/src/AuthSamples/build/dependencies.props b/src/AuthSamples/build/dependencies.props
index 6d4ff5523a25..ac3ece853779 100644
--- a/src/AuthSamples/build/dependencies.props
+++ b/src/AuthSamples/build/dependencies.props
@@ -56,8 +56,6 @@
3.0.0-preview-181106-14
3.19.8
5.3.0
- 2.0.9
- 2.1.3
3.0.0-preview1-26907-05
3.0.0-preview-18579-0056
15.6.1
diff --git a/src/AuthSamples/build/repo.props b/src/AuthSamples/build/repo.props
deleted file mode 100644
index aa7e07e780af..000000000000
--- a/src/AuthSamples/build/repo.props
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/src/Components/Directory.Build.props b/src/Components/Directory.Build.props
index 98dd18f1abad..9e1947bcc84c 100644
--- a/src/Components/Directory.Build.props
+++ b/src/Components/Directory.Build.props
@@ -16,6 +16,9 @@
true
false
+
+
+ false
diff --git a/src/Components/Directory.Build.targets b/src/Components/Directory.Build.targets
index a643937da22d..923e24463832 100644
--- a/src/Components/Directory.Build.targets
+++ b/src/Components/Directory.Build.targets
@@ -1,7 +1,5 @@
- $(MicrosoftNETCoreApp22PackageVersion)
-
- 99.9
+ $(MicrosoftNETCoreAppPackageVersion)
diff --git a/src/Components/build/dependencies.props b/src/Components/build/dependencies.props
index 8cf890eb21aa..619a1f4b09d9 100644
--- a/src/Components/build/dependencies.props
+++ b/src/Components/build/dependencies.props
@@ -12,7 +12,7 @@
3.0.0-alpha1-10605
3.0.0-alpha1-10605
3.0.0-alpha1-10605
- 3.0.0-preview1-26907-05
+ 3.0.0-preview-27122-01
3.0.0-alpha1-10605
0.8.0-preview1-20181122.3
2.1.2
diff --git a/src/Components/build/repo.props b/src/Components/build/repo.props
index eaba6eac818f..a74cc6e6a975 100644
--- a/src/Components/build/repo.props
+++ b/src/Components/build/repo.props
@@ -7,10 +7,6 @@
-
- Internal.AspNetCore.Universe.Lineup
- https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json
-
true
@@ -37,6 +33,9 @@
+
+
+
diff --git a/src/Http/Http.Features/test/Microsoft.AspNetCore.Http.Features.Tests.csproj b/src/Http/Http.Features/test/Microsoft.AspNetCore.Http.Features.Tests.csproj
index b7c77fc19f24..2ad7d65e4d6a 100644
--- a/src/Http/Http.Features/test/Microsoft.AspNetCore.Http.Features.Tests.csproj
+++ b/src/Http/Http.Features/test/Microsoft.AspNetCore.Http.Features.Tests.csproj
@@ -1,7 +1,7 @@
- $(StandardTestTfms)
+ netcoreapp3.0;net461
diff --git a/src/Identity/test/ApiAuth.IS.Test/Microsoft.AspNetCore.ApiAuthorization.IdentityServer.Test.csproj b/src/Identity/test/ApiAuth.IS.Test/Microsoft.AspNetCore.ApiAuthorization.IdentityServer.Test.csproj
index f47aef44484a..8dc9683fb366 100644
--- a/src/Identity/test/ApiAuth.IS.Test/Microsoft.AspNetCore.ApiAuthorization.IdentityServer.Test.csproj
+++ b/src/Identity/test/ApiAuth.IS.Test/Microsoft.AspNetCore.ApiAuthorization.IdentityServer.Test.csproj
@@ -1,7 +1,7 @@
- $(StandardTestTfms)
+ netcoreapp3.0
diff --git a/src/Identity/test/Directory.Build.props b/src/Identity/test/Directory.Build.props
index b64c163712cf..b9ebade8ca0f 100644
--- a/src/Identity/test/Directory.Build.props
+++ b/src/Identity/test/Directory.Build.props
@@ -1,12 +1,6 @@
-
- netcoreapp3.0
- $(DeveloperBuildTestTfms)
- $(StandardTestTfms)
-
-
diff --git a/src/Identity/test/EF.InMemory.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj b/src/Identity/test/EF.InMemory.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj
index 178a2a1dda38..4c15efc47c2c 100644
--- a/src/Identity/test/EF.InMemory.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj
+++ b/src/Identity/test/EF.InMemory.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.InMemory.Test.csproj
@@ -1,7 +1,7 @@
- $(StandardTestTfms)
+ netcoreapp3.0
diff --git a/src/Identity/test/EF.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj b/src/Identity/test/EF.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj
index bc8464f59be5..4cea868fcb79 100644
--- a/src/Identity/test/EF.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj
+++ b/src/Identity/test/EF.Test/Microsoft.AspNetCore.Identity.EntityFrameworkCore.Test.csproj
@@ -1,7 +1,7 @@
- $(StandardTestTfms)
+ netcoreapp3.0
diff --git a/src/Identity/test/InMemory.Test/Microsoft.AspNetCore.Identity.InMemory.Test.csproj b/src/Identity/test/InMemory.Test/Microsoft.AspNetCore.Identity.InMemory.Test.csproj
index a10e779d7e06..4e99761dd158 100644
--- a/src/Identity/test/InMemory.Test/Microsoft.AspNetCore.Identity.InMemory.Test.csproj
+++ b/src/Identity/test/InMemory.Test/Microsoft.AspNetCore.Identity.InMemory.Test.csproj
@@ -1,7 +1,7 @@
- $(StandardTestTfms)
+ netcoreapp3.0
diff --git a/src/Mvc/Directory.Build.targets b/src/Mvc/Directory.Build.targets
index 51a6545f0c05..7a09b207eb11 100644
--- a/src/Mvc/Directory.Build.targets
+++ b/src/Mvc/Directory.Build.targets
@@ -1,7 +1,5 @@
- $(MicrosoftNETCoreApp21PackageVersion)
$(MicrosoftNETCoreAppPackageVersion)
- $(NETStandardLibrary20PackageVersion)
diff --git a/src/Mvc/build/dependencies.props b/src/Mvc/build/dependencies.props
index dd1c4333c744..9b114d73d2a0 100644
--- a/src/Mvc/build/dependencies.props
+++ b/src/Mvc/build/dependencies.props
@@ -83,8 +83,6 @@
3.0.0-preview.18605.1
3.0.0-preview.18605.1
3.0.0-preview.18605.1
- 2.0.9
- 2.1.3
3.0.0-preview-27122-01
3.0.0-preview-18606-0099
3.0.0-preview-18605-0080
diff --git a/src/Mvc/build/repo.props b/src/Mvc/build/repo.props
index 8ed774df9076..4a6cc42c9979 100644
--- a/src/Mvc/build/repo.props
+++ b/src/Mvc/build/repo.props
@@ -14,7 +14,6 @@
-
diff --git a/src/SiteExtensions/test/Directory.Build.props b/src/SiteExtensions/test/Directory.Build.props
index 4e09287e4d99..41a959605778 100644
--- a/src/SiteExtensions/test/Directory.Build.props
+++ b/src/SiteExtensions/test/Directory.Build.props
@@ -1,13 +1,6 @@
-
- netcoreapp2.2
- $(DeveloperBuildTestTfms)
-
- $(StandardTestTfms);net461
-
-
diff --git a/src/Templating/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj b/src/Templating/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj
index bda8a8afd1a2..060d541e11f6 100644
--- a/src/Templating/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj
+++ b/src/Templating/src/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj
@@ -23,7 +23,6 @@
MicrosoftAspNetCorePackageVersion=$(MicrosoftAspNetCorePackageVersion);
MicrosoftAspNetCoreAppPackageVersion=$(MicrosoftAspNetCoreAppPackageVersion);
MicrosoftAspNetCoreSpaServicesExtensionsPackageVersion=$(MicrosoftAspNetCoreSpaServicesExtensionsPackageVersion);
- MicrosoftNETCoreApp22PackageVersion=$(MicrosoftNETCoreApp22PackageVersion);