diff --git a/appveyor.yml b/.appveyor.yml similarity index 100% rename from appveyor.yml rename to .appveyor.yml diff --git a/Directory.Build.props b/Directory.Build.props new file mode 100644 index 0000000000..91758478ee --- /dev/null +++ b/Directory.Build.props @@ -0,0 +1,16 @@ + + + + + + Microsoft ASP.NET Core + https://github.com/aspnet/MetaPackages + git + false + $(MSBuildThisFileDirectory)build\Key.snk + true + true + $(VersionSuffix)-$(BuildNumber) + true + + diff --git a/Directory.Build.targets b/Directory.Build.targets new file mode 100644 index 0000000000..f75adf7e4d --- /dev/null +++ b/Directory.Build.targets @@ -0,0 +1,2 @@ + + diff --git a/MetaPackages.sln b/MetaPackages.sln index 2957cc0c6d..838833a98c 100644 --- a/MetaPackages.sln +++ b/MetaPackages.sln @@ -1,8 +1,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26727.1 +VisualStudioVersion = 15.0.26730.10 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{ED834E68-51C3-4ADE-ACC8-6BA6D4207C09}" + ProjectSection(SolutionItems) = preProject + src\Directory.Build.props = src\Directory.Build.props + EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore", "src\Microsoft.AspNetCore\Microsoft.AspNetCore.csproj", "{6F3D43F7-9546-4B41-AF04-CF4708B62051}" EndProject @@ -10,13 +13,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.All", EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{97D53BEB-A511-4FBE-B784-AB407D9A219F}" ProjectSection(SolutionItems) = preProject + Directory.Build.props = Directory.Build.props + Directory.Build.targets = Directory.Build.targets NuGet.config = NuGet.config version.xml = version.xml EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{F92CB7A1-C38E-408C-A7EC-A5C040D041E1}" ProjectSection(SolutionItems) = preProject - build\common.props = build\common.props build\dependencies.props = build\dependencies.props build\repo.targets = build\repo.targets EndProjectSection @@ -26,6 +30,9 @@ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleApp", "samples\SampleApp\SampleApp.csproj", "{AF5BB04E-92F7-4737-8B98-F86F6244FAB2}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{9E49B5B9-9E72-42FB-B684-90CA1B1BCF9C}" + ProjectSection(SolutionItems) = preProject + test\Directory.Build.props = test\Directory.Build.props + EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.FunctionalTests", "test\Microsoft.AspNetCore.FunctionalTests\Microsoft.AspNetCore.FunctionalTests.csproj", "{C72A756A-D29D-44C7-83D4-821DBE82DBCA}" EndProject diff --git a/build/BuildArchive.proj b/build/BuildArchive.proj index eadad66b41..3d2110bddc 100644 --- a/build/BuildArchive.proj +++ b/build/BuildArchive.proj @@ -1,10 +1,4 @@ - - - - - - - + diff --git a/build/common.props b/build/common.props deleted file mode 100644 index 6203de218d..0000000000 --- a/build/common.props +++ /dev/null @@ -1,203 +0,0 @@ - - - - - - Microsoft ASP.NET Core - https://github.com/aspnet/MetaPackages - git - false - ..\..\build\Key.snk - true - true - $(VersionSuffix) - $(VersionSuffix)-$(BuildNumber) - true - - - $(VersionPrefix)-$(VersionSuffix) - - - - - - - - - - - $(AspNetCoreVersion) - None - - - $(AspNetCoreVersion) - None - - - $(AspNetCoreVersion) - Compile - - - $(AspNetCoreVersion) - None - - - None - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/dependencies.props b/build/dependencies.props index 20950edc8f..0cb948e13a 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -1,7 +1,9 @@ - + 0.5.0-* 2.1.0-* + + $(VersionPrefix)-$(VersionSuffix) 4.4.0-* 2.0.0-preview2-* 2.1.1-* @@ -12,4 +14,183 @@ 15.3.0 2.3.0-beta4-build3742 + + + + + + $(AspNetCoreVersion) + None + + + $(AspNetCoreVersion) + None + + + $(AspNetCoreVersion) + Compile + + + $(AspNetCoreVersion) + None + + + None + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/repo.targets b/build/repo.targets index aa664ebd15..1e11e3a619 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -1,12 +1,11 @@ - - - - - - + + + $(VersionSuffix) + $(VersionSuffix)-$(BuildNumber) + $(RepositoryRoot)src\Microsoft.AspNetCore.RuntimeStore\ $(MetaPackagePath)Microsoft.AspNetCore.RuntimeStore.csproj diff --git a/samples/SampleApp/SampleApp.csproj b/samples/SampleApp/SampleApp.csproj index 620cf71def..35b28c8284 100644 --- a/samples/SampleApp/SampleApp.csproj +++ b/samples/SampleApp/SampleApp.csproj @@ -1,7 +1,5 @@  - - netcoreapp2.0;net461 aspnetcore-MetaPackagesSampleApp-20170406180413 diff --git a/src/Archive.AspNetCore.All/Archive.AspNetCore.All.csproj b/src/Archive.AspNetCore.All/Archive.AspNetCore.All.csproj index 3d1b205678..5315e09987 100644 --- a/src/Archive.AspNetCore.All/Archive.AspNetCore.All.csproj +++ b/src/Archive.AspNetCore.All/Archive.AspNetCore.All.csproj @@ -1,6 +1,4 @@ - - - + netcoreapp2.0 diff --git a/src/Directory.Build.props b/src/Directory.Build.props new file mode 100644 index 0000000000..d704a37df9 --- /dev/null +++ b/src/Directory.Build.props @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj b/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj index b97348f7db..4b702d4b73 100644 --- a/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj +++ b/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj @@ -1,7 +1,5 @@  - - false netcoreapp2.0 diff --git a/src/Microsoft.AspNetCore.AzureAppServices.TestBundle/Microsoft.AspNetCore.AzureAppServices.TestBundle.csproj b/src/Microsoft.AspNetCore.AzureAppServices.TestBundle/Microsoft.AspNetCore.AzureAppServices.TestBundle.csproj index e8e11b68d6..25dee0572c 100644 --- a/src/Microsoft.AspNetCore.AzureAppServices.TestBundle/Microsoft.AspNetCore.AzureAppServices.TestBundle.csproj +++ b/src/Microsoft.AspNetCore.AzureAppServices.TestBundle/Microsoft.AspNetCore.AzureAppServices.TestBundle.csproj @@ -1,7 +1,5 @@  - - ASP.NET Core Extensions This extension enables additional functionality for ASP.NET Core on Azure WebSites, such as enabling Azure logging. diff --git a/src/Microsoft.AspNetCore.RuntimeStore/Microsoft.AspNetCore.RuntimeStore.csproj b/src/Microsoft.AspNetCore.RuntimeStore/Microsoft.AspNetCore.RuntimeStore.csproj index 0e7105f770..e05f4dba2f 100644 --- a/src/Microsoft.AspNetCore.RuntimeStore/Microsoft.AspNetCore.RuntimeStore.csproj +++ b/src/Microsoft.AspNetCore.RuntimeStore/Microsoft.AspNetCore.RuntimeStore.csproj @@ -1,7 +1,5 @@  - - netcoreapp2.0 diff --git a/src/Microsoft.AspNetCore/Microsoft.AspNetCore.csproj b/src/Microsoft.AspNetCore/Microsoft.AspNetCore.csproj index cf888d57ca..508e334cb7 100644 --- a/src/Microsoft.AspNetCore/Microsoft.AspNetCore.csproj +++ b/src/Microsoft.AspNetCore/Microsoft.AspNetCore.csproj @@ -1,7 +1,5 @@  - - netstandard2.0 aspnetcore diff --git a/test/Directory.Build.props b/test/Directory.Build.props new file mode 100644 index 0000000000..d704a37df9 --- /dev/null +++ b/test/Directory.Build.props @@ -0,0 +1,7 @@ + + + + + + + diff --git a/test/Microsoft.AspNetCore.FunctionalTests/Microsoft.AspNetCore.FunctionalTests.csproj b/test/Microsoft.AspNetCore.FunctionalTests/Microsoft.AspNetCore.FunctionalTests.csproj index c8e3826622..131e2ee181 100644 --- a/test/Microsoft.AspNetCore.FunctionalTests/Microsoft.AspNetCore.FunctionalTests.csproj +++ b/test/Microsoft.AspNetCore.FunctionalTests/Microsoft.AspNetCore.FunctionalTests.csproj @@ -1,7 +1,5 @@  - - netcoreapp2.0;net461 netcoreapp2.0 diff --git a/test/TestSites/CreateDefaultBuilderApp/CreateDefaultBuilderApp.csproj b/test/TestSites/CreateDefaultBuilderApp/CreateDefaultBuilderApp.csproj index 65c45e2363..0956c47f07 100644 --- a/test/TestSites/CreateDefaultBuilderApp/CreateDefaultBuilderApp.csproj +++ b/test/TestSites/CreateDefaultBuilderApp/CreateDefaultBuilderApp.csproj @@ -1,7 +1,5 @@  - - Exe netcoreapp2.0 diff --git a/test/TestSites/DependencyInjectionApp/DependencyInjectionApp.csproj b/test/TestSites/DependencyInjectionApp/DependencyInjectionApp.csproj index 2124775352..04691e82ed 100644 --- a/test/TestSites/DependencyInjectionApp/DependencyInjectionApp.csproj +++ b/test/TestSites/DependencyInjectionApp/DependencyInjectionApp.csproj @@ -1,7 +1,5 @@  - - Exe netcoreapp2.0 diff --git a/test/TestSites/StartRequestDelegateUrlApp/StartRequestDelegateUrlApp.csproj b/test/TestSites/StartRequestDelegateUrlApp/StartRequestDelegateUrlApp.csproj index d960839e9f..0c089dbc33 100644 --- a/test/TestSites/StartRequestDelegateUrlApp/StartRequestDelegateUrlApp.csproj +++ b/test/TestSites/StartRequestDelegateUrlApp/StartRequestDelegateUrlApp.csproj @@ -1,7 +1,5 @@  - - Exe netcoreapp2.0 diff --git a/test/TestSites/StartRouteBuilderUrlApp/StartRouteBuilderUrlApp.csproj b/test/TestSites/StartRouteBuilderUrlApp/StartRouteBuilderUrlApp.csproj index d960839e9f..0c089dbc33 100644 --- a/test/TestSites/StartRouteBuilderUrlApp/StartRouteBuilderUrlApp.csproj +++ b/test/TestSites/StartRouteBuilderUrlApp/StartRouteBuilderUrlApp.csproj @@ -1,7 +1,5 @@  - - Exe netcoreapp2.0 diff --git a/test/TestSites/StartWithIApplicationBuilderUrlApp/StartWithIApplicationBuilderUrlApp.csproj b/test/TestSites/StartWithIApplicationBuilderUrlApp/StartWithIApplicationBuilderUrlApp.csproj index d960839e9f..0c089dbc33 100644 --- a/test/TestSites/StartWithIApplicationBuilderUrlApp/StartWithIApplicationBuilderUrlApp.csproj +++ b/test/TestSites/StartWithIApplicationBuilderUrlApp/StartWithIApplicationBuilderUrlApp.csproj @@ -1,7 +1,5 @@  - - Exe netcoreapp2.0 diff --git a/tools/Build.RuntimeStore.References/Build.RuntimeStore.References.csproj b/tools/Build.RuntimeStore.References/Build.RuntimeStore.References.csproj index cb2a84480e..76f439edf3 100644 --- a/tools/Build.RuntimeStore.References/Build.RuntimeStore.References.csproj +++ b/tools/Build.RuntimeStore.References/Build.RuntimeStore.References.csproj @@ -2,8 +2,6 @@ - - false netcoreapp2.0 @@ -14,7 +12,7 @@ - + diff --git a/tools/Microsoft.AspNetCore.HostingStartup.Template/Microsoft.AspNetCore.HostingStartup.Template.csproj b/tools/Microsoft.AspNetCore.HostingStartup.Template/Microsoft.AspNetCore.HostingStartup.Template.csproj index 021bb290c5..284a46c5ab 100644 --- a/tools/Microsoft.AspNetCore.HostingStartup.Template/Microsoft.AspNetCore.HostingStartup.Template.csproj +++ b/tools/Microsoft.AspNetCore.HostingStartup.Template/Microsoft.AspNetCore.HostingStartup.Template.csproj @@ -1,7 +1,4 @@ - - - - + netcoreapp2.0 @@ -19,6 +16,6 @@ - + diff --git a/tools/TrimDeps/TrimDeps.csproj b/tools/TrimDeps/TrimDeps.csproj index 4ae54603b3..7a4e82dded 100644 --- a/tools/TrimDeps/TrimDeps.csproj +++ b/tools/TrimDeps/TrimDeps.csproj @@ -1,7 +1,4 @@ - - - - + netcoreapp2.0 diff --git a/tools/dotnet-deb-tool-consumer/dotnet-deb-tool-consumer.csproj b/tools/dotnet-deb-tool-consumer/dotnet-deb-tool-consumer.csproj index 3512a7a21c..db3987ea48 100644 --- a/tools/dotnet-deb-tool-consumer/dotnet-deb-tool-consumer.csproj +++ b/tools/dotnet-deb-tool-consumer/dotnet-deb-tool-consumer.csproj @@ -1,6 +1,4 @@ - - - + netcoreapp1.0