From 151e79466f4a351c2a4a605b40d01fed78b91027 Mon Sep 17 00:00:00 2001 From: Steve Ballantine Date: Thu, 1 Dec 2022 13:01:07 +0000 Subject: [PATCH 1/3] Merged PR 7921: FEAT: Remove dependency on SourceLink package. #4773 FEAT: Remove dependency on SourceLink package. #4773 Related work items: #4773 --- 51D.md | 24 ------------------- .../FiftyOne.DeviceDetection.Cloud.csproj | 4 ---- .../FiftyOne.DeviceDetection.Shared.csproj | 4 ---- ...viceDetection.Hash.Engine.OnPremise.csproj | 4 ---- .../FiftyOne.DeviceDetection.csproj | 4 ---- ci/shared-build-and-test-stage.yml | 4 +++- 6 files changed, 3 insertions(+), 41 deletions(-) delete mode 100644 51D.md diff --git a/51D.md b/51D.md deleted file mode 100644 index 19ee8b40..00000000 --- a/51D.md +++ /dev/null @@ -1,24 +0,0 @@ -# Internal Use - -## Enable debugging of NuGet packages - -In order to debug into NuGet packages, you must be using packages that reference debug symbols. By default, this includes all pre-release packages but not final versions. -If you have a debuggable package then you will need to configure Visual Studio to allow you to step into it: - -- In tools -> options -> debugging -> symbols, add the Azure DevOps symbol server: -![Visual Studio 2017 screenshot with symbol server added][ImageAddSymbolServer] -- Select the ‘Load only specified modules’ option at the bottom and configure it to only load Symbols for 51Degrees modules as shown below: -![Visual Studio 2017 configured to only load external symbols for 51Degrees libraries][ImageLoadOnlyFiftyone] -- In tools -> options -> debugging -> general, ensure that: - - Enable Just My Code is off. Having this on will prevent VS stepping into any NuGet packages. - - Enable source server support is on. - - Example Source Link support is on. -![Visual Studio 2017 configured for debugging external packages][ImageConfigureDebugger] - -When stepping into a method from a relevant NuGet package, you should now see the following warning message: -![Visual Studio 2017 Source Link download warning][ImageSourceLinkDownload] - -[ImageAddSymbolServer]: file://Images/vs2017-add-symbol-server.png -[ImageConfigureDebugger]: file://Images/vs2017-configure-debugger.png -[ImageLoadOnlyFiftyone]: file://Images/vs2017-load-only-fiftyone.png -[ImageSourceLinkDownload]: file://Images/vs2017-source-link-download.png \ No newline at end of file diff --git a/FiftyOne.DeviceDetection/FiftyOne.DeviceDetection.Cloud/FiftyOne.DeviceDetection.Cloud.csproj b/FiftyOne.DeviceDetection/FiftyOne.DeviceDetection.Cloud/FiftyOne.DeviceDetection.Cloud.csproj index 13f5bbf9..94a8f79a 100644 --- a/FiftyOne.DeviceDetection/FiftyOne.DeviceDetection.Cloud/FiftyOne.DeviceDetection.Cloud.csproj +++ b/FiftyOne.DeviceDetection/FiftyOne.DeviceDetection.Cloud/FiftyOne.DeviceDetection.Cloud.csproj @@ -42,10 +42,6 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - diff --git a/FiftyOne.DeviceDetection/FiftyOne.DeviceDetection.Data/FiftyOne.DeviceDetection.Shared.csproj b/FiftyOne.DeviceDetection/FiftyOne.DeviceDetection.Data/FiftyOne.DeviceDetection.Shared.csproj index 8610b6f3..ead2f735 100644 --- a/FiftyOne.DeviceDetection/FiftyOne.DeviceDetection.Data/FiftyOne.DeviceDetection.Shared.csproj +++ b/FiftyOne.DeviceDetection/FiftyOne.DeviceDetection.Data/FiftyOne.DeviceDetection.Shared.csproj @@ -42,10 +42,6 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - diff --git a/FiftyOne.DeviceDetection/FiftyOne.DeviceDetection.Hash.Engine.OnPremise/FiftyOne.DeviceDetection.Hash.Engine.OnPremise.csproj b/FiftyOne.DeviceDetection/FiftyOne.DeviceDetection.Hash.Engine.OnPremise/FiftyOne.DeviceDetection.Hash.Engine.OnPremise.csproj index 8a57f410..fe2d6bdb 100644 --- a/FiftyOne.DeviceDetection/FiftyOne.DeviceDetection.Hash.Engine.OnPremise/FiftyOne.DeviceDetection.Hash.Engine.OnPremise.csproj +++ b/FiftyOne.DeviceDetection/FiftyOne.DeviceDetection.Hash.Engine.OnPremise/FiftyOne.DeviceDetection.Hash.Engine.OnPremise.csproj @@ -72,10 +72,6 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - diff --git a/FiftyOne.DeviceDetection/FiftyOne.DeviceDetection/FiftyOne.DeviceDetection.csproj b/FiftyOne.DeviceDetection/FiftyOne.DeviceDetection/FiftyOne.DeviceDetection.csproj index 25613db8..468896a5 100644 --- a/FiftyOne.DeviceDetection/FiftyOne.DeviceDetection/FiftyOne.DeviceDetection.csproj +++ b/FiftyOne.DeviceDetection/FiftyOne.DeviceDetection/FiftyOne.DeviceDetection.csproj @@ -42,10 +42,6 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - diff --git a/ci/shared-build-and-test-stage.yml b/ci/shared-build-and-test-stage.yml index ad96f349..3812f12a 100644 --- a/ci/shared-build-and-test-stage.yml +++ b/ci/shared-build-and-test-stage.yml @@ -91,7 +91,9 @@ stages: inputs: version: 3.1.x performMultiLevelLookup: true - packageType: sdk + packageType: sdk + env: + PROCESSOR_ARCHITECTURE: '$(BuildPlatform)' # Download the latest V4 TAC hash file from the distributor - task: PowerShell@2 From 8637902e022b6c421b2a855f9fcdef19f3e92e08 Mon Sep 17 00:00:00 2001 From: Steve Ballantine Date: Mon, 5 Dec 2022 17:03:09 +0000 Subject: [PATCH 2/3] Merged PR 7957: FEAT: Examples will now use references to packages by default, rather than projects. FEAT: Examples will now use references to packages by default, rather than projects. Project references can be enabled for testing by setting the 'TestExamples51D' environment variable to 'True' #5255 Related work items: #5255 --- .../Configurator-Console.csproj | 1 - .../Cloud/Framework-Web/Framework-Web.csproj | 20 +++++++++++++------ Examples/Cloud/Framework-Web/packages.config | 7 ++++++- .../GetAllProperties.csproj | 2 -- .../GettingStarted-Console.csproj | 2 -- .../GettingStarted-Web.csproj | 1 - .../Metadata-Console/Metadata-Console.csproj | 1 - .../NativeModelLookup-Console.csproj | 1 - .../TAC-Console/TacLookup-Console.csproj | 2 -- .../FiftyOne.DeviceDetection.Examples.csproj | 18 +++++++++++------ .../AppleServerSide-Console.csproj | 1 - .../AppleServerSideConfig-Console.csproj | 1 - .../GettingStarted-Console.csproj | 2 -- .../GettingStarted-Web.csproj | 1 - .../MatchMetrics-Console.csproj | 1 - .../Metadata-Console/Metadata-Console.csproj | 1 - .../OfflineProcessing-Console.csproj | 1 - .../Performance-Console.csproj | 1 - .../UpdateDataFile-Console.csproj | 2 -- ...nt-Hints Not Integrated NetCore 3.1.csproj | 16 +++++++++++---- .../Client-Hints NetCore 3.1.csproj | 16 +++++++++++---- ...nt-Hints Not Integrated NetCore 3.1.csproj | 18 ++++++++++++----- .../Cloud - Client-Hints NetCore 3.1.csproj | 16 +++++++++++---- ci/shared-build-and-test-stage-linux.yml | 3 ++- ci/shared-build-and-test-stage.yml | 1 + 25 files changed, 84 insertions(+), 52 deletions(-) diff --git a/Examples/Cloud/Configurator-Console/Configurator-Console.csproj b/Examples/Cloud/Configurator-Console/Configurator-Console.csproj index e42c1dbe..d7367625 100644 --- a/Examples/Cloud/Configurator-Console/Configurator-Console.csproj +++ b/Examples/Cloud/Configurator-Console/Configurator-Console.csproj @@ -13,7 +13,6 @@ - diff --git a/Examples/Cloud/Framework-Web/Framework-Web.csproj b/Examples/Cloud/Framework-Web/Framework-Web.csproj index 2a1fe0cd..805f7678 100644 --- a/Examples/Cloud/Framework-Web/Framework-Web.csproj +++ b/Examples/Cloud/Framework-Web/Framework-Web.csproj @@ -44,6 +44,18 @@ 4 + + ..\..\..\packages\FiftyOne.DeviceDetection.4.4.12\lib\netstandard2.0\FiftyOne.DeviceDetection.dll + + + ..\..\..\packages\FiftyOne.DeviceDetection.Cloud.4.4.12\lib\netstandard2.0\FiftyOne.DeviceDetection.Cloud.dll + + + ..\..\..\packages\FiftyOne.DeviceDetection.Hash.Engine.OnPremise.4.4.12\lib\netstandard2.0\FiftyOne.DeviceDetection.Hash.Engine.OnPremise.dll + + + ..\..\..\packages\FiftyOne.DeviceDetection.Shared.4.4.12\lib\netstandard2.0\FiftyOne.DeviceDetection.Shared.dll + ..\..\..\packages\FiftyOne.Pipeline.CloudRequestEngine.4.4.7\lib\netstandard2.0\FiftyOne.Pipeline.CloudRequestEngine.dll @@ -289,12 +301,6 @@ Site.Master - - - {b085f69e-d9d9-43cd-83bf-dc881a9ed501} - FiftyOne.DeviceDetection.Cloud - - @@ -374,7 +380,9 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + +