From cc37fadd7816f2fe65dd2bf3a4a1e43bb2cd4574 Mon Sep 17 00:00:00 2001 From: David Driscoll Date: Sun, 22 Jul 2018 20:36:51 -0400 Subject: [PATCH] Updated --- Common.Build.props | 30 +------------- Common.Build.targets | 39 +++++++++++++++++++ samples/FunctionApp1/FunctionApp1.csproj | 15 ++++--- .../Rocket.Surgery.Azure.Functions.csproj | 18 ++++----- .../Rocket.Surgery.Azure.Storage.csproj | 20 +++++----- src/Directory.Build.targets | 3 ++ .../Rocket.Surgery.Azure.Tests.csproj | 4 +- test/Directory.Build.props | 2 +- test/Directory.Build.targets | 23 +++++------ 9 files changed, 84 insertions(+), 70 deletions(-) create mode 100644 Common.Build.targets create mode 100644 src/Directory.Build.targets diff --git a/Common.Build.props b/Common.Build.props index e684ef91..52bc3ea3 100644 --- a/Common.Build.props +++ b/Common.Build.props @@ -5,32 +5,4 @@ David Driscoll latest - - 2.1.0 - 3.0.0 - 0.8.0 - 0.11.0 - 0.8.2 - 1.0.7 - 5.0.0 - 4.6.2 - 2.3.0 - 2.0.0 - 11.0.2 - 9.2.0 - 3.0.0-beta5 - 2.1.0 - 2.1.0 - 2.1.0 - 2.8.3 - 0.8.0 - 15.7.2 - 2.3.1 - 5.4.1 - 4.6.0 - 5.0.1 - 22.1.3 - 2.0.0 - 2.0.1 - - + \ No newline at end of file diff --git a/Common.Build.targets b/Common.Build.targets new file mode 100644 index 00000000..c0707cf4 --- /dev/null +++ b/Common.Build.targets @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/samples/FunctionApp1/FunctionApp1.csproj b/samples/FunctionApp1/FunctionApp1.csproj index 4403609a..d42620c9 100644 --- a/samples/FunctionApp1/FunctionApp1.csproj +++ b/samples/FunctionApp1/FunctionApp1.csproj @@ -1,4 +1,4 @@ - + netstandard2.0 v2 @@ -6,16 +6,15 @@ true - - - - - + + + + + - PreserveNewest @@ -25,6 +24,6 @@ Never - + diff --git a/src/Azure.Functions/Rocket.Surgery.Azure.Functions.csproj b/src/Azure.Functions/Rocket.Surgery.Azure.Functions.csproj index e2cd3926..50a42876 100644 --- a/src/Azure.Functions/Rocket.Surgery.Azure.Functions.csproj +++ b/src/Azure.Functions/Rocket.Surgery.Azure.Functions.csproj @@ -1,18 +1,18 @@ - + netstandard2.0;net461 - - - - - - - + + + + + + + - + \ No newline at end of file diff --git a/src/Azure.Storage/Rocket.Surgery.Azure.Storage.csproj b/src/Azure.Storage/Rocket.Surgery.Azure.Storage.csproj index 17ac266c..a5b43cad 100644 --- a/src/Azure.Storage/Rocket.Surgery.Azure.Storage.csproj +++ b/src/Azure.Storage/Rocket.Surgery.Azure.Storage.csproj @@ -3,14 +3,14 @@ netstandard2.0;net461 - - - - - - - - - + + + + + + + + + - + \ No newline at end of file diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets new file mode 100644 index 00000000..286f354b --- /dev/null +++ b/src/Directory.Build.targets @@ -0,0 +1,3 @@ + + + diff --git a/test/Azure.Tests/Rocket.Surgery.Azure.Tests.csproj b/test/Azure.Tests/Rocket.Surgery.Azure.Tests.csproj index 1b89583c..1fe66406 100644 --- a/test/Azure.Tests/Rocket.Surgery.Azure.Tests.csproj +++ b/test/Azure.Tests/Rocket.Surgery.Azure.Tests.csproj @@ -5,6 +5,6 @@ - + - + \ No newline at end of file diff --git a/test/Directory.Build.props b/test/Directory.Build.props index 1e3ee12c..32860939 100644 --- a/test/Directory.Build.props +++ b/test/Directory.Build.props @@ -9,7 +9,7 @@ true json,lcov,cobertura - $([System.IO.Path]::GetDirectoryName($([MSBuild]::GetPathOfFileAbove('Common.Build.props', '$(MSBuildThisFileDirectory)../'))))/coverage/ + $([System.IO.Path]::GetDirectoryName($([MSBuild]::GetPathOfFileAbove('Common.Build.props', '$(MSBuildThisFileDirectory)../'))))/coverage/ $(MSBuildProjectName)-$(TargetFramework) diff --git a/test/Directory.Build.targets b/test/Directory.Build.targets index 51d02568..e8865b2a 100644 --- a/test/Directory.Build.targets +++ b/test/Directory.Build.targets @@ -1,20 +1,21 @@ - - - - - - - - - - - + + + + + + + + + + + PreserveNewest +