From ba5c4b755b9c97211734da0ed7885750f14c1fb4 Mon Sep 17 00:00:00 2001 From: Timothy Mothra Lee Date: Wed, 16 Oct 2019 17:22:44 -0700 Subject: [PATCH] refactor projects remove "artifacts" directory. Now using same bin and obj directories as all other repos. --- Directory.Build.props | 39 +++++++++++++++++++ EnlistmentRoot.marker | 0 Nupkg.props | 16 ++++++++ Product.props | 21 ++++++++++ SourceRoot.marker | 0 ...soft.ApplicationInsights.AspNetCore.csproj | 11 +----- ...t.ApplicationInsights.WorkerService.csproj | 12 +----- .../ApplicationInsightsTypes.csproj | 2 - .../EmptyApp.FunctionalTests10.csproj | 2 - .../EmptyApp20.FunctionalTests20.csproj | 2 - .../FunctionalTestUtils.csproj | 2 - .../FunctionalTestUtils20.csproj | 2 - .../MVCFramework.FunctionalTests10.csproj | 2 - .../MVCFramework20.FunctionalTests20.csproj | 2 - ...pplicationInsights.AspNetCore.Tests.csproj | 2 - ...icationInsights.WorkerService.Tests.csproj | 2 - test/TestApp30.Tests/TestApp30.Tests30.csproj | 1 - test/TestApp30/TestApp30.csproj | 1 - .../WebApi.FunctionalTests10.csproj | 2 - .../WebApi20.FunctionalTests20.csproj | 2 - 20 files changed, 80 insertions(+), 43 deletions(-) create mode 100644 Directory.Build.props create mode 100644 EnlistmentRoot.marker create mode 100644 Product.props create mode 100644 SourceRoot.marker diff --git a/Directory.Build.props b/Directory.Build.props new file mode 100644 index 0000000..321f21d --- /dev/null +++ b/Directory.Build.props @@ -0,0 +1,39 @@ + + + + + + + + + $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'EnlistmentRoot.marker')) + $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'SourceRoot.marker')) + + $(EnlistmentRoot)\..\bin + $([System.IO.Path]::GetFullPath( $(BinRoot) )) + + $(EnlistmentRoot)\..\obj + $([System.IO.Path]::GetFullPath( $(ObjRoot) )) + + $(MSBuildProjectDirectory.Substring($(SourceRoot.Length))) + + + + Debug + + $(BinRoot)\$(Configuration)\$(RelativeOutputPathBase) + $([System.IO.Path]::GetFullPath( $(OutputPath) ))\ + + + $(BinRoot)\$(Configuration)\NuGet + $(PackageOutputDir) + + $(OutputPath) + + $(ObjRoot)\$(Configuration)\$(RelativeOutputPathBase) + $([System.IO.Path]::GetFullPath( $(IntermediateOutputPath) ))\ + + + + \ No newline at end of file diff --git a/EnlistmentRoot.marker b/EnlistmentRoot.marker new file mode 100644 index 0000000..e69de29 diff --git a/Nupkg.props b/Nupkg.props index 8d15710..c4c7d5e 100644 --- a/Nupkg.props +++ b/Nupkg.props @@ -37,4 +37,20 @@ + + + + + + + \ No newline at end of file diff --git a/Product.props b/Product.props new file mode 100644 index 0000000..0f6fcac --- /dev/null +++ b/Product.props @@ -0,0 +1,21 @@ + + + + + + + + + + 2.12.0-beta1 + + + + + + + + + \ No newline at end of file diff --git a/SourceRoot.marker b/SourceRoot.marker new file mode 100644 index 0000000..e69de29 diff --git a/src/Microsoft.ApplicationInsights.AspNetCore/Microsoft.ApplicationInsights.AspNetCore.csproj b/src/Microsoft.ApplicationInsights.AspNetCore/Microsoft.ApplicationInsights.AspNetCore.csproj index 6015be0..e476568 100644 --- a/src/Microsoft.ApplicationInsights.AspNetCore/Microsoft.ApplicationInsights.AspNetCore.csproj +++ b/src/Microsoft.ApplicationInsights.AspNetCore/Microsoft.ApplicationInsights.AspNetCore.csproj @@ -1,16 +1,14 @@  - + Microsoft.ApplicationInsights.AspNetCore - 2.12.0-beta1 7.2 netstandard2.0;net451;net46;netstandard1.6 netstandard1.6;netstandard2.0 1.6.1 - ..\..\artifacts\src\$(MSBuildProjectName) - ..\..\artifacts\obj\src\$(MSBuildProjectName) + $(DefineConstants);AI_ASPNETCORE_WEB; @@ -66,7 +64,6 @@ - @@ -99,8 +96,4 @@ - - - - diff --git a/src/Microsoft.ApplicationInsights.WorkerService/Microsoft.ApplicationInsights.WorkerService.csproj b/src/Microsoft.ApplicationInsights.WorkerService/Microsoft.ApplicationInsights.WorkerService.csproj index cb2e571..912e42d 100644 --- a/src/Microsoft.ApplicationInsights.WorkerService/Microsoft.ApplicationInsights.WorkerService.csproj +++ b/src/Microsoft.ApplicationInsights.WorkerService/Microsoft.ApplicationInsights.WorkerService.csproj @@ -1,14 +1,11 @@  - + Microsoft.ApplicationInsights.WorkerService - 2.12.0-beta1 7.2 netstandard2.0 - ..\..\artifacts\src\$(MSBuildProjectName) - ..\..\artifacts\obj\src\$(MSBuildProjectName) $(DefineConstants);AI_ASPNETCORE_WORKER; @@ -71,10 +68,5 @@ - - - - - - + diff --git a/test/ApplicationInsightsTypes/ApplicationInsightsTypes.csproj b/test/ApplicationInsightsTypes/ApplicationInsightsTypes.csproj index e081fe0..87ff308 100644 --- a/test/ApplicationInsightsTypes/ApplicationInsightsTypes.csproj +++ b/test/ApplicationInsightsTypes/ApplicationInsightsTypes.csproj @@ -12,8 +12,6 @@ true ApplicationInsightsTypes 1.6.1 - ..\..\artifacts\test\$(MSBuildProjectName) - ..\..\artifacts\obj\test\$(MSBuildProjectName) $(MSBuildThisFileDirectory)\Generated false diff --git a/test/EmptyApp.FunctionalTests/EmptyApp.FunctionalTests10.csproj b/test/EmptyApp.FunctionalTests/EmptyApp.FunctionalTests10.csproj index 2ed5676..af3b2e4 100644 --- a/test/EmptyApp.FunctionalTests/EmptyApp.FunctionalTests10.csproj +++ b/test/EmptyApp.FunctionalTests/EmptyApp.FunctionalTests10.csproj @@ -11,8 +11,6 @@ EmptyApp.FunctionalTests true - ..\..\artifacts\test\$(MSBuildProjectName) - ..\..\artifacts\obj\test\$(MSBuildProjectName) pdbonly true diff --git a/test/EmptyApp20.FunctionalTests/EmptyApp20.FunctionalTests20.csproj b/test/EmptyApp20.FunctionalTests/EmptyApp20.FunctionalTests20.csproj index 7d62786..0ad2d65 100644 --- a/test/EmptyApp20.FunctionalTests/EmptyApp20.FunctionalTests20.csproj +++ b/test/EmptyApp20.FunctionalTests/EmptyApp20.FunctionalTests20.csproj @@ -10,8 +10,6 @@ EmptyApp20.FunctionalTests true 2.0.0 - ..\..\artifacts\test\$(MSBuildProjectName) - ..\..\artifacts\obj\test\$(MSBuildProjectName) pdbonly true true diff --git a/test/FunctionalTestUtils/FunctionalTestUtils.csproj b/test/FunctionalTestUtils/FunctionalTestUtils.csproj index d9f0c01..2e5b92b 100644 --- a/test/FunctionalTestUtils/FunctionalTestUtils.csproj +++ b/test/FunctionalTestUtils/FunctionalTestUtils.csproj @@ -8,8 +8,6 @@ FunctionalTestUtils FunctionalTestUtils 1.6.1 - ..\..\artifacts\test\$(MSBuildProjectName) - ..\..\artifacts\obj\test\$(MSBuildProjectName) diff --git a/test/FunctionalTestUtils20/FunctionalTestUtils20.csproj b/test/FunctionalTestUtils20/FunctionalTestUtils20.csproj index 3c82f8d..2bddf41 100644 --- a/test/FunctionalTestUtils20/FunctionalTestUtils20.csproj +++ b/test/FunctionalTestUtils20/FunctionalTestUtils20.csproj @@ -8,8 +8,6 @@ FunctionalTestUtils20 FunctionalTestUtils 2.0.0 - ..\..\artifacts\test\$(MSBuildProjectName) - ..\..\artifacts\obj\test\$(MSBuildProjectName) diff --git a/test/MVCFramework.FunctionalTests/MVCFramework.FunctionalTests10.csproj b/test/MVCFramework.FunctionalTests/MVCFramework.FunctionalTests10.csproj index 54f06e4..1f6534b 100644 --- a/test/MVCFramework.FunctionalTests/MVCFramework.FunctionalTests10.csproj +++ b/test/MVCFramework.FunctionalTests/MVCFramework.FunctionalTests10.csproj @@ -11,8 +11,6 @@ true aspnet-MVCFramework45.FunctionalTests-60cfc765-2dc9-454c-bb34-dc379ed92cd0 1.1.5 - ..\..\artifacts\test\$(MSBuildProjectName) - ..\..\artifacts\obj\test\$(MSBuildProjectName) true true pdbonly diff --git a/test/MVCFramework20.FunctionalTests/MVCFramework20.FunctionalTests20.csproj b/test/MVCFramework20.FunctionalTests/MVCFramework20.FunctionalTests20.csproj index 9865800..57e6a13 100644 --- a/test/MVCFramework20.FunctionalTests/MVCFramework20.FunctionalTests20.csproj +++ b/test/MVCFramework20.FunctionalTests/MVCFramework20.FunctionalTests20.csproj @@ -11,8 +11,6 @@ true aspnet-MVCFramework45.FunctionalTests-60cfc765-2dc9-454c-bb34-dc379ed92cd0 2.0.0 - ..\..\artifacts\test\$(MSBuildProjectName) - ..\..\artifacts\obj\test\$(MSBuildProjectName) true true pdbonly diff --git a/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Microsoft.ApplicationInsights.AspNetCore.Tests.csproj b/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Microsoft.ApplicationInsights.AspNetCore.Tests.csproj index 28299df..61530c0 100644 --- a/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Microsoft.ApplicationInsights.AspNetCore.Tests.csproj +++ b/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Microsoft.ApplicationInsights.AspNetCore.Tests.csproj @@ -13,8 +13,6 @@ Microsoft.ApplicationInsights.AspNetCore.Tests true 1.1.5 - ..\..\artifacts\test\$(MSBuildProjectName) - ..\..\artifacts\obj\test\$(MSBuildProjectName) pdbonly true diff --git a/test/Microsoft.ApplicationInsights.WorkerService.Tests/Microsoft.ApplicationInsights.WorkerService.Tests.csproj b/test/Microsoft.ApplicationInsights.WorkerService.Tests/Microsoft.ApplicationInsights.WorkerService.Tests.csproj index cc0bca3..2388bd1 100644 --- a/test/Microsoft.ApplicationInsights.WorkerService.Tests/Microsoft.ApplicationInsights.WorkerService.Tests.csproj +++ b/test/Microsoft.ApplicationInsights.WorkerService.Tests/Microsoft.ApplicationInsights.WorkerService.Tests.csproj @@ -2,8 +2,6 @@ netcoreapp2.1 - ..\..\artifacts\test\$(MSBuildProjectName) - ..\..\artifacts\obj\test\$(MSBuildProjectName) diff --git a/test/TestApp30.Tests/TestApp30.Tests30.csproj b/test/TestApp30.Tests/TestApp30.Tests30.csproj index f34ee93..b3b695d 100644 --- a/test/TestApp30.Tests/TestApp30.Tests30.csproj +++ b/test/TestApp30.Tests/TestApp30.Tests30.csproj @@ -2,7 +2,6 @@ netcoreapp3.0 - ..\..\artifacts\test\$(MSBuildProjectName) diff --git a/test/TestApp30/TestApp30.csproj b/test/TestApp30/TestApp30.csproj index a4e1cb9..2910353 100644 --- a/test/TestApp30/TestApp30.csproj +++ b/test/TestApp30/TestApp30.csproj @@ -2,7 +2,6 @@ netcoreapp3.0 - ..\..\artifacts\test\$(MSBuildProjectName) diff --git a/test/WebApi.FunctionalTests/WebApi.FunctionalTests10.csproj b/test/WebApi.FunctionalTests/WebApi.FunctionalTests10.csproj index 234b6fe..89f8ebf 100644 --- a/test/WebApi.FunctionalTests/WebApi.FunctionalTests10.csproj +++ b/test/WebApi.FunctionalTests/WebApi.FunctionalTests10.csproj @@ -11,8 +11,6 @@ true $(PackageTargetFallback);portable-net45+win8 1.1.5 - ..\..\artifacts\test\$(MSBuildProjectName) - ..\..\artifacts\obj\test\$(MSBuildProjectName) pdbonly true diff --git a/test/WebApi20.FunctionalTests/WebApi20.FunctionalTests20.csproj b/test/WebApi20.FunctionalTests/WebApi20.FunctionalTests20.csproj index ea69a78..7b85bd7 100644 --- a/test/WebApi20.FunctionalTests/WebApi20.FunctionalTests20.csproj +++ b/test/WebApi20.FunctionalTests/WebApi20.FunctionalTests20.csproj @@ -10,8 +10,6 @@ WebApi20.FunctionalTests true 2.0.0 - ..\..\artifacts\test\$(MSBuildProjectName) - ..\..\artifacts\obj\test\$(MSBuildProjectName) pdbonly true