From 69227081c290e6fdd70d537d936b9cb8d6119ac3 Mon Sep 17 00:00:00 2001
From: Emmanuel Mathot <emmanuel.mathot@terradue.com>
Date: Mon, 11 Apr 2022 16:37:29 +0200
Subject: [PATCH 1/2] fix dll plugin load for self contained package

---
 .vscode/launch.json                           |   5 +-
 .../WalkEachTargetPerProject.targets          | 165 ------------------
 .../Terradue/OpenSearch/Model/DataModel.cs    |   2 +-
 3 files changed, 4 insertions(+), 168 deletions(-)
 delete mode 100644 Terradue.OpenSearch.Client/WalkEachTargetPerProject.targets

diff --git a/.vscode/launch.json b/.vscode/launch.json
index fe5afff1..81c47555 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -5,13 +5,14 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "Query sentinel2 index",
+            "name": "Query sentinel1 index",
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build",
             "program": "${workspaceRoot}/Terradue.OpenSearch.Client/bin/Debug/net5.0/OpenSearchClient",
             "args": [
-                "https://catalog.terradue.com/sentinel2/search"
+                "https://catalog.terradue.com/sentinel1/search",
+                "enclosure"
             ],
             "cwd": "${workspaceRoot}",
             "stopAtEntry": false,
diff --git a/Terradue.OpenSearch.Client/WalkEachTargetPerProject.targets b/Terradue.OpenSearch.Client/WalkEachTargetPerProject.targets
deleted file mode 100644
index 759c5266..00000000
--- a/Terradue.OpenSearch.Client/WalkEachTargetPerProject.targets
+++ /dev/null
@@ -1,165 +0,0 @@
-<!-- https://github.com/dotnet/cli/issues/3959 -->
-<!-- HACK: Uses internal NuGet targets. -->
-<Project>
-  <!-- Remove project references from appearing as dependencies. -->
-  <Target Name="_RemoveProjectReferences"
-          AfterTargets="_GenerateRestoreGraph">
-    <ItemGroup>
-      <!--
-        Removing the ProjectReference items directly or setting PrivateAssets to All on them prevents their 
-        dependencies from being added to the restore graph. ProjectReference items become _RestoreGraphEntry 
-        items with Type set to ProjectSpec. This removes their entries after their dependencies have been 
-        added.
-      -->
-      <_RemoveRestoreGraphEntry Include="@(_RestoreGraphEntry->WithMetadataValue('Type', 'ProjectSpec'))" />
-      <!-- All ProjectReference items get included anyway unless the restoring project is not removed. -->
-      <_RemoveRestoreGraphEntry Remove="@(_RemoveRestoreGraphEntry->WithMetadataValue('ProjectUniqueName', $(MSBuildProjectFullPath)))" />
-      <_RestoreGraphEntry Remove="@(_RemoveRestoreGraphEntry)" />
-    </ItemGroup>
-  </Target>
-
-  <Target Name="_CollectPackageReferencesPerProject"
-          BeforeTargets="CollectPackageReferences">
-    <!-- NOTE: This doesn't collect package references from projects with PrivateAssets set to All. -->
-    <MSBuild Projects="@(ProjectReference)"
-             Targets="CollectPackageReferences">
-      <Output TaskParameter="TargetOutputs" ItemName="PackageReference" />
-    </MSBuild>
-  </Target>
-
-  <Target Name="_ExcludeThisBuildOutput"
-          BeforeTargets="_WalkEachTargetPerFramework">
-    <PropertyGroup>
-      <IncludeBuildOutput Condition="'$(IncludeThisBuildOutput)' == 'false'">false</IncludeBuildOutput>
-    </PropertyGroup>
-  </Target>
-
-  <Target Name="_WalkEachProjectPerFramework"
-          DependsOnTargets="Restore"
-          AfterTargets="_WalkEachTargetPerFramework">
-    <PropertyGroup>
-      <!-- Include the following outputs in the package. -->
-      <IncludeBuildOutput Condition="'$(IncludeThisBuildOutput)' == 'false'">true</IncludeBuildOutput>
-    </PropertyGroup>
-
-    <MSBuild Projects="$(MSBuildProjectFullPath)"
-             Targets="__GetBuildOutputFilesWithTfm"
-             Properties="_TargetFramework=%(_TargetFrameworks.Identity)">
-      <Output TaskParameter="TargetOutputs" ItemName="_BuildOutputInPackage" />
-    </MSBuild>
-
-    <MSBuild Projects="$(MSBuildProjectFullPath)"
-             Targets="__GetTfmSpecificContentForPackage"
-             Properties="_TargetFramework=%(_TargetFrameworks.Identity)">
-      <Output TaskParameter="TargetOutputs" ItemName="_PackageFiles" />
-    </MSBuild>
-
-    <MSBuild Projects="$(MSBuildProjectFullPath)"
-             Targets="__GetDebugSymbolsWithTfm"
-             Properties="_TargetFramework=%(_TargetFrameworks.Identity)">
-      <Output TaskParameter="TargetOutputs" ItemName="_TargetPathsToSymbols" />
-    </MSBuild>
-
-    <MSBuild Projects="$(MSBuildProjectFullPath)"
-             Targets="_SourceFilesProjectOutputGroup"
-             Properties="_TargetFramework=%(_TargetFrameworks.Identity)">
-      <Output TaskParameter="TargetOutputs" ItemName="_SourceFiles" />
-    </MSBuild>
-
-    <MSBuild Projects="$(MSBuildProjectFullPath)"
-             Targets="__GetFrameworkAssemblyReferences"
-             Properties="_TargetFramework=%(_TargetFrameworks.Identity)">
-      <Output TaskParameter="TargetOutputs" ItemName="_FrameworkAssemblyReferences" />
-    </MSBuild>
-  </Target>
-
-  <!-- Include the output assembly, satellite assemblies, documentation file, and Pri file. -->
-  <Target Name="__GetBuildOutputFilesWithTfm"
-          DependsOnTargets="__CollectProjectReferences"
-          Returns="@(_BuildOutputInPackage)">
-    <MSBuild Projects="@(_ProjectReference)"
-             Targets="_GetBuildOutputFilesWithTfm">
-      <Output TaskParameter="TargetOutputs" ItemName="__BuildOutputInPackage" />
-    </MSBuild>
-
-    <ItemGroup>
-      <_BuildOutputInPackage Include="@(__BuildOutputInPackage)">
-        <TargetFramework>$(_TargetFramework)</TargetFramework>
-      </_BuildOutputInPackage>
-    </ItemGroup>
-  </Target>
-
-  <!-- Include content files. -->
-  <Target Name="__GetTfmSpecificContentForPackage"
-          DependsOnTargets="__CollectProjectReferences"
-          Returns="@(_PackageFiles)">
-    <MSBuild Projects="@(_ProjectReference)"
-             Targets="_GetTfmSpecificContentForPackage">
-      <Output TaskParameter="TargetOutputs" ItemName="__PackageFiles" />
-    </MSBuild>
-
-    <ItemGroup>
-      <_PackageFiles Include="@(__PackageFiles)">
-        <TargetFramework>$(_TargetFramework)</TargetFramework>
-      </_PackageFiles>
-    </ItemGroup>
-  </Target>
-
-  <!-- Include debug symbols. -->
-  <Target Name="__GetDebugSymbolsWithTfm"
-          DependsOnTargets="__CollectProjectReferences"
-          Returns="@(_TargetPathsToSymbols)">
-    <MSBuild Projects="@(_ProjectReference)"
-             Targets="_GetDebugSymbolsWithTfm">
-      <Output TaskParameter="TargetOutputs" ItemName="__TargetPathsToSymbols" />
-    </MSBuild>
-
-    <ItemGroup>
-      <_TargetPathsToSymbols Include="@(__TargetPathsToSymbols)">
-        <TargetFramework>$(_TargetFramework)</TargetFramework>
-      </_TargetPathsToSymbols>
-    </ItemGroup>
-  </Target>
-
-  <!-- Include source files. -->
-  <!-- NOTE: Don't think this works correctly. -->
-  <Target Name="_SourceFilesProjectOutputGroup"
-          DependsOnTargets="__CollectProjectReferences"
-          Returns="@(_SourceFiles)">
-    <MSBuild Projects="@(_ProjectReference)"
-             Targets="SourceFilesProjectOutputGroup"
-             Properties="BuildProjectReferences=false"
-             Condition="'$(IncludeSource)' == 'true'">
-      <Output TaskParameter="TargetOutputs" ItemName="__SourceFiles" />
-    </MSBuild>
-
-    <ItemGroup>
-      <_SourceFiles Include="@(__SourceFiles)">
-        <TargetFramework>$(_TargetFramework)</TargetFramework>
-      </_SourceFiles>
-    </ItemGroup>
-  </Target>
-
-  <!-- Include framework assembly references. -->
-  <Target Name="__GetFrameworkAssemblyReferences"
-          DependsOnTargets="__CollectProjectReferences"
-          Returns="@(_FrameworkAssemblyReferences)">
-    <MSBuild Projects="$(_ProjectReference)"
-             Targets="_GetFrameworkAssemblyReferences"
-             Properties="BuildProjectReferences=false">
-      <Output TaskParameter="TargetOutputs" ItemName="_FrameworkAssemblyReferences" />
-    </MSBuild>
-  </Target>
-
-  <Target Name="__CollectProjectReferences"
-          Returns="@(_ProjectReference)">
-    <MSBuild Projects="$(MSBuildProjectFullPath)"
-             Targets="_CollectProjectReferences"
-             Properties="TargetFramework=$(_TargetFramework)">
-      <Output TaskParameter="TargetOutputs" ItemName="_ProjectReference" />
-    </MSBuild>
-  </Target>
-
-  <Target Name="_CollectProjectReferences"
-          Returns="@(ProjectReference)" />
-</Project>
diff --git a/Terradue.OpenSearch.Model/Terradue/OpenSearch/Model/DataModel.cs b/Terradue.OpenSearch.Model/Terradue/OpenSearch/Model/DataModel.cs
index 861c0560..a8ddc3eb 100644
--- a/Terradue.OpenSearch.Model/Terradue/OpenSearch/Model/DataModel.cs
+++ b/Terradue.OpenSearch.Model/Terradue/OpenSearch/Model/DataModel.cs
@@ -43,7 +43,7 @@ public static IOpenSearchClientDataModelExtension FindPluginByName(string name)
             string dirpath = Path.GetDirectoryName((new System.Uri(Assembly.GetExecutingAssembly().CodeBase)).AbsolutePath);
 
             log.Debug(string.Format("Scan {0} for OpenSearch Client plugins", dirpath));
-            foreach (string dll in Directory.GetFiles(dirpath, "*.dll"))
+            foreach (string dll in Directory.GetFiles(dirpath, "Terradue.*.dll"))
                 allAssemblies.Add(Assembly.LoadFile(dll));
 
             foreach (var assembly in allAssemblies) {

From 3442a85856a34a28f96d572f1337ee0d6e9bf0a6 Mon Sep 17 00:00:00 2001
From: Emmanuel Mathot <emmanuel.mathot@terradue.com>
Date: Mon, 11 Apr 2022 16:38:33 +0200
Subject: [PATCH 2/2] ready to release 2.0.1

---
 CHANGELOG.md                                           | 10 +++++++++-
 .../Terradue.OpenSearch.Client.csproj                  |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6c69cace..e3984345 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,10 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
-## [2.0.0](https://github.com/Terradue/DotNetOpenSearchClient/compare/1.9.9...2.0.0)
+## [2.0.1](https://github.com/Terradue/DotNetOpenSearchClient/compare/2.0.0...2.0.1)
 
 ### Commits
 
+- fix dll plugin load for self contained package [`6922708`](https://github.com/Terradue/DotNetOpenSearchClient/commit/69227081c290e6fdd70d537d936b9cb8d6119ac3)
+- fix release [`1380f94`](https://github.com/Terradue/DotNetOpenSearchClient/commit/1380f9448144278597403bbb18eff1d1ad67ccf7)
+
+## [2.0.0](https://github.com/Terradue/DotNetOpenSearchClient/compare/1.9.9...2.0.0) - 2022-04-11
+
+### Commits
+
+- CHANGELOG [`80d33dc`](https://github.com/Terradue/DotNetOpenSearchClient/commit/80d33dc7d36aa23607ac242e84a37177005056ce)
 - new build [`33e03f7`](https://github.com/Terradue/DotNetOpenSearchClient/commit/33e03f7ef62616d289bf7a0200a0590d1a98d2ef)
 - move to net5 [`43b4d02`](https://github.com/Terradue/DotNetOpenSearchClient/commit/43b4d02649d2587b19909a11502a2fa873b1fc51)
 - removed src [`e35aaf3`](https://github.com/Terradue/DotNetOpenSearchClient/commit/e35aaf34ca728807aa9beced98bd1d67c1116320)
diff --git a/Terradue.OpenSearch.Client/Terradue.OpenSearch.Client.csproj b/Terradue.OpenSearch.Client/Terradue.OpenSearch.Client.csproj
index dae91987..d2184c7e 100644
--- a/Terradue.OpenSearch.Client/Terradue.OpenSearch.Client.csproj
+++ b/Terradue.OpenSearch.Client/Terradue.OpenSearch.Client.csproj
@@ -8,7 +8,7 @@
     <Title>DotNetOpenSearchClient</Title>
     <Description>Generic OpenSearch Client</Description>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
-    <Version>2.0.0</Version>
+    <Version>2.0.1</Version>
     <Authors>Emmanuel Mathot</Authors>
     <Company>Terradue</Company>
     <RepositoryUrl>https://github.com/Terradue/DotNetOpenSearchClient</RepositoryUrl>