From 37de630f39c967f4289b5173007c9ca0c1cc87a7 Mon Sep 17 00:00:00 2001 From: Chris Martinez Date: Fri, 6 Apr 2018 15:04:56 -0700 Subject: [PATCH 1/3] Update badge URL to internal build definition --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 46e82174..321a6334 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![VSTS Build Status](https://mrtechnocal.visualstudio.com/_apis/public/build/definitions/f0b1168c-671a-4dd1-ac55-2f0e25c4a405/1/badge)](https://mrtechnocal.visualstudio.com/ApiVersioning/_build/index?definitionId=1) +[![VSTS Build Status](https://microsoft.visualstudio.com/_apis/public/build/definitions/8d47e068-03c8-4cdc-aa9b-fc6929290322/25012/badge) # ASP.NET API Versioning From da7fa8137903bb592cbccba8ff1e91e488126449 Mon Sep 17 00:00:00 2001 From: Chris Martinez Date: Fri, 6 Apr 2018 15:05:34 -0700 Subject: [PATCH 2/3] Update build to support code and package signing --- ApiVersioning.sln | 5 +++ after.apiversioning.sln.targets | 34 ++++++++++++++++++++ build/common.props | 4 +-- build/file-version.targets | 19 ++++++------ build/nuget.props | 7 +---- build/signing.targets | 43 ++++++++++++++++++++++++++ samples/webapi/directory.build.targets | 7 +++++ src/directory.build.targets | 5 ++- 8 files changed, 106 insertions(+), 18 deletions(-) create mode 100644 after.apiversioning.sln.targets create mode 100644 build/signing.targets create mode 100644 samples/webapi/directory.build.targets diff --git a/ApiVersioning.sln b/ApiVersioning.sln index 25c0a5b7..920ed5ff 100644 --- a/ApiVersioning.sln +++ b/ApiVersioning.sln @@ -29,6 +29,9 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{915BB224-B1D0-4E27-A348-67FCC77AAA44}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "webapi", "webapi", "{F446ED94-368F-4F67-913B-16E82CA80DFC}" + ProjectSection(SolutionItems) = preProject + samples\webapi\directory.build.targets = samples\webapi\directory.build.targets + EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "aspnetcore", "aspnetcore", "{900DD210-8500-4D89-A05D-C9526935A719}" EndProject @@ -102,6 +105,7 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Common.ApiExplorer", "src\C EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{2BB57808-14AF-4209-9842-1D6E76A99C3F}" ProjectSection(SolutionItems) = preProject + after.apiversioning.sln.targets = after.apiversioning.sln.targets build\code-analysis.props = build\code-analysis.props build\common.props = build\common.props build\file-version.targets = build\file-version.targets @@ -109,6 +113,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{2BB57808 build\nuget.targets = build\nuget.targets build\resource.targets = build\resource.targets build\signing.props = build\signing.props + build\signing.targets = build\signing.targets EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{3BDDAF5E-4148-4D7F-9B9A-EA11D0110FEB}" diff --git a/after.apiversioning.sln.targets b/after.apiversioning.sln.targets new file mode 100644 index 00000000..a3ce1659 --- /dev/null +++ b/after.apiversioning.sln.targets @@ -0,0 +1,34 @@ + + + + + + + + + Debug + + + + + + + + + + + + + + Configuration=$(Configuration); + FilesToSign=@(TargetFiles->'%(Identity)','|') + + $(SigningProperties);SignJobName=$(SignJobName) + $(SigningProperties);SignApprovers=$(SignApprovers) + + + + + + + \ No newline at end of file diff --git a/build/common.props b/build/common.props index ab05ca0c..f69d871b 100644 --- a/build/common.props +++ b/build/common.props @@ -3,8 +3,8 @@ Microsoft Corporation - $(Company) - Copyright © 2016. $(Company). All rights reserved. + Microsoft + © $(Company). All rights reserved. en en-US diff --git a/build/file-version.targets b/build/file-version.targets index 60e0530a..4f6f27a3 100644 --- a/build/file-version.targets +++ b/build/file-version.targets @@ -1,14 +1,15 @@ - - - $(AssemblyVersion.Split(`.`)[0]).$(AssemblyVersion.Split(`.`)[1]) - $([System.DateTime]::Now.IsDaylightSavingTime()) - $([System.DateTime]::Today.Subtract($([System.DateTime]::Parse("1/1/2000"))).ToString("%d")) - $([System.Convert]::ToInt32($([MSBuild]::Divide($([System.DateTime]::Now.TimeOfDay.Subtract($([System.TimeSpan]::FromHours(1.0))).TotalSeconds),2)))) - $([System.Convert]::ToInt32($([MSBuild]::Divide($([System.DateTime]::Now.TimeOfDay.TotalSeconds),2)))) - $(MajorAndMinorVersion).$(FileBuildNumber).$(FileBuildRevision) - + + + 1.0.0.0 + $(AssemblyVersion.Split(`.`)[0]).$(AssemblyVersion.Split(`.`)[1]) + $([System.DateTime]::Now.IsDaylightSavingTime()) + $([System.DateTime]::Today.Subtract($([System.DateTime]::Parse("1/1/2000"))).ToString("%d")) + $([System.Convert]::ToInt32($([MSBuild]::Divide($([System.DateTime]::Now.TimeOfDay.Subtract($([System.TimeSpan]::FromHours(1.0))).TotalSeconds),2)))) + $([System.Convert]::ToInt32($([MSBuild]::Divide($([System.DateTime]::Now.TimeOfDay.TotalSeconds),2)))) + $(MajorAndMinorVersion).$(FileBuildNumber).$(FileBuildRevision) + \ No newline at end of file diff --git a/build/nuget.props b/build/nuget.props index edfa238e..8cbdd4f9 100644 --- a/build/nuget.props +++ b/build/nuget.props @@ -12,7 +12,7 @@ true true 2.5 - $(MSBuildThisFileDirectory)..\bin + $(MSBuildThisFileDirectory)..\bin @@ -20,9 +20,4 @@ - - true - true - - \ No newline at end of file diff --git a/build/signing.targets b/build/signing.targets new file mode 100644 index 00000000..65b0724a --- /dev/null +++ b/build/signing.targets @@ -0,0 +1,43 @@ + + + + + + + + + ASP.NET API Versioning + + + Authenticode + + $([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\bin')) + + + + + + + + AnyCPU + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/samples/webapi/directory.build.targets b/samples/webapi/directory.build.targets new file mode 100644 index 00000000..50a7388a --- /dev/null +++ b/samples/webapi/directory.build.targets @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/src/directory.build.targets b/src/directory.build.targets index 11e52442..6de42da9 100644 --- a/src/directory.build.targets +++ b/src/directory.build.targets @@ -2,7 +2,8 @@ - bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml + true + bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml @@ -11,4 +12,6 @@ + + \ No newline at end of file From 6e22fdd5a156b26e367cab0a0e876aa91ca48b87 Mon Sep 17 00:00:00 2001 From: Chris Martinez Date: Wed, 11 Apr 2018 16:51:38 -0700 Subject: [PATCH 3/3] Update process to use ESRP only --- after.apiversioning.sln.targets | 12 ++++++------ build/signing.targets | 31 ++++--------------------------- 2 files changed, 10 insertions(+), 33 deletions(-) diff --git a/after.apiversioning.sln.targets b/after.apiversioning.sln.targets index a3ce1659..6075abd9 100644 --- a/after.apiversioning.sln.targets +++ b/after.apiversioning.sln.targets @@ -3,31 +3,31 @@ - + Debug + Configuration=$(Configuration) + $(BuildProperties);Platform=$(Platform) - + - Configuration=$(Configuration); + SourceDir=$(MSBuildThisFileDirectory)\src; FilesToSign=@(TargetFiles->'%(Identity)','|') - $(SigningProperties);SignJobName=$(SignJobName) - $(SigningProperties);SignApprovers=$(SignApprovers) - + diff --git a/build/signing.targets b/build/signing.targets index 65b0724a..bdd30fb6 100644 --- a/build/signing.targets +++ b/build/signing.targets @@ -1,42 +1,19 @@ - + + - - - - - ASP.NET API Versioning - - - Authenticode - $([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\bin')) - - - - - - AnyCPU - + - - - - - - - - - - +