Adopt the abstractions migration.

Signed-off-by: Yury-Fridlyand <[email protected]>

Directory.Build.targets

@@ -1,8 +1,8 @@
 <Project>
-  <Import Project="$(SolutionRoot)\src\_PublishArtifacts.Build.props" Condition="$(IsPackable) == True"/>
+  <Import Project="src\_PublishArtifacts.Build.props" Condition="$(IsPackable) == True"/>
   <PropertyGroup Condition="$(IsPackable) == True OR $(MSBuildProjectName.StartsWith('Tests'))">
     <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>$(SolutionRoot)\build\keys\keypair.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>$(SolutionDir)\build\keys\keypair.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <PropertyGroup Condition="$(IsPackable) == True">
     <OutDir>bin/$(Configuration)/$(TargetFramework)/</OutDir>

abstractions/README.md

@@ -17,8 +17,6 @@
 
 You've reached the home repository for several auxiliary projects from the .NET team within OpenSearch.
 
-Pre-release packages of these projects are available at [OpenSearch NuGet Package Repository](https://www.github.com/opensearch-project/packages). See [GitHub documentation](https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-nuget-registry#installing-a-package) for instructions on how to access them.
-
 Current projects:
 
 ### [OpenSearch.OpenSearch.Managed](src/OpenSearch.OpenSearch.Managed/README.md)

abstractions/src/Directory.Build.props

@@ -5,10 +5,7 @@
     <Authors>OpenSearch Project and contributors</Authors>
     <Copyright>OpenSearch</Copyright>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
-    <RepositoryUrl>https://github.com/opensearch-project/opensearch-net-abstractions</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
-    <PackageProjectUrl>https://github.com/opensearch-project/opensearch-net-abstractions</PackageProjectUrl>
-    <PackageReleaseNotes>https://github.com/opensearch-project/opensearch-net-abstractions/releases</PackageReleaseNotes>
 
 
     <SignAssembly>true</SignAssembly>
@@ -19,19 +16,6 @@
     <PackageIcon>nuget-icon.png</PackageIcon>
 
   </PropertyGroup>
-
-  <ItemGroup>
-    <Content Include="../../nuget-icon.png" CopyToOutputDirectory="PreserveNewest">
-      <Link>nuget-icon.png</Link>
-      <Pack>True</Pack>
-      <PackagePath>nuget-icon.png</PackagePath>
-    </Content>
-    <None Include="../../LICENSE.txt" CopyToOutputDirectory="PreserveNewest">
-      <Pack>True</Pack>
-      <PackagePath>LICENSE.txt</PackagePath>
-    </None>
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
     <PackageReference Include="ConfigureAwaitChecker.Analyzer" Version="4.0.0" PrivateAssets="All" />

abstractions/src/OpenSearch.OpenSearch.Ephemeral/OpenSearch.OpenSearch.Ephemeral.csproj

@@ -4,6 +4,7 @@
     <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
     <Description>Provides an EphemeralCluster implementation that can download/bootstrap/run a throwaway customizable OpenSearch cluster</Description>
     <PackageTags>opensearch,opensearch,cluster,ephemeral</PackageTags>
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="SharpZipLib.NETStandard" Version="1.0.7" />
@@ -12,4 +13,4 @@
   <ItemGroup>
     <ProjectReference Include="..\OpenSearch.OpenSearch.Managed\OpenSearch.OpenSearch.Managed.csproj" />
   </ItemGroup>
-</Project>
+</Project>

abstractions/src/OpenSearch.OpenSearch.Managed/OpenSearch.OpenSearch.Managed.csproj

@@ -7,13 +7,13 @@
       Also ships with an cluster abstraction that can start one or more OpenSearchNode's
     </Description>
     <PackageTags>opensearch,opensearch,cluster,observable,rx</PackageTags>
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Proc" Version="0.6.1" />
-    <!--<ProjectReference Include="..\..\..\..\proc\src\Proc\Proc.csproj" />-->
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OpenSearch.Stack.ArtifactsApi\OpenSearch.Stack.ArtifactsApi.csproj" />
   </ItemGroup>
-</Project>
+</Project>

abstractions/src/OpenSearch.OpenSearch.Xunit/OpenSearch.OpenSearch.Xunit.csproj

@@ -2,14 +2,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
-    <IsPackable>True</IsPackable>
     <Description>Provides an Xunit test framework allowing you to run integration tests against local ephemeral OpenSearch clusters</Description>
     <PackageTags>opensearch,opensearch,xunit,cluster,integration,test,ephemeral</PackageTags>
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="xunit" Version="2.4.2" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OpenSearch.OpenSearch.Ephemeral\OpenSearch.OpenSearch.Ephemeral.csproj" />
   </ItemGroup>
-</Project>
+</Project>

abstractions/src/OpenSearch.Stack.ArtifactsApi/OpenSearch.Stack.ArtifactsApi.csproj

@@ -3,6 +3,7 @@
         <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
         <Description>Provides a set of classes to resolve the location of OpenSearch stack products in various stages: released, snapshot and build candidates</Description>
         <PackageTags>opensearch,opensearch,stack,versioning,artifacts</PackageTags>
+        <IsPackable>false</IsPackable>
     </PropertyGroup>
 
     <ItemGroup>

abstractions/src/OpenSearch.Stack.ArtifactsApi/Platform/OsMonikers.cs

@@ -50,7 +50,7 @@ public static OSPlatform CurrentPlatform()
 			if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) return OSPlatform.OSX;
 			if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) return OSPlatform.Linux;
 			throw new Exception(
-				$"{RuntimeInformation.OSDescription} is currently not supported please open an issue @opensearch-project/opensearch-net-abstractions");
+				$"{RuntimeInformation.OSDescription} is currently not supported please open an issue @opensearch-project/opensearch-net");
 		}
 
 		/// <summary>
@@ -78,7 +78,7 @@ public static string GetOpenSearchPlatformMoniker(OSPlatform platform, Architect
 				if (architecture == Architecture.Arm64) return "linux-arm64";
 			}
 			throw new Exception(
-				$"{RuntimeInformation.OSDescription} is currently not supported please open an issue @opensearch-project/opensearch-net-abstractions");
+				$"{RuntimeInformation.OSDescription} is currently not supported please open an issue @opensearch-project/opensearch-net");
 		}
 
 		public static string GetPlatformArchiveExtension(OSPlatform platform)
@@ -87,7 +87,7 @@ public static string GetPlatformArchiveExtension(OSPlatform platform)
 			if (platform == OSPlatform.OSX) return "tar.gz";
 			if (platform == OSPlatform.Windows) return "zip";
 			throw new Exception(
-				$"{RuntimeInformation.OSDescription} is currently not supported please open an issue @opensearch-project/opensearch-net-abstractions");
+				$"{RuntimeInformation.OSDescription} is currently not supported please open an issue @opensearch-project/opensearch-net");
 
 		}
 		public static string CurrentPlatformArchiveExtension()
@@ -104,7 +104,7 @@ public static string CurrentPlatformPackageSuffix()
 			if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) return $"{Linux}-{intelX86Suffix}";
 
 			throw new Exception(
-				$"{RuntimeInformation.OSDescription} is currently not supported please open an issue @opensearch-project/opensearch-net-abstractions");
+				$"{RuntimeInformation.OSDescription} is currently not supported please open an issue @opensearch-project/opensearch-net");
 		}
 
 		internal static string CurrentPlatformSearchFilter()
@@ -114,7 +114,7 @@ internal static string CurrentPlatformSearchFilter()
 			if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) return "tar";
 
 			throw new Exception(
-				$"{RuntimeInformation.OSDescription} is currently not supported please open an issue @opensearch-project/opensearch-net-abstractions");
+				$"{RuntimeInformation.OSDescription} is currently not supported please open an issue @opensearch-project/opensearch-net");
 		}
 	}
 }

build/scripts/packages.lock.json

@@ -77,7 +77,10 @@
         "type": "Direct",
         "requested": "[1.0.0-preview.2, )",
         "resolved": "1.0.0-preview.2",
-        "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg=="
+        "contentHash": "m+pJPEO7HyXvrOna5Sr3s77ewXonjYWJTNL6drh8xACnMNxnlqUDKx9HfGeSE9wmfY0lQwppaeZpFTPGaH7kZg==",
+        "dependencies": {
+          "Microsoft.NETFramework.ReferenceAssemblies.net461": "1.0.0-preview.2"
+        }
       },
       "Newtonsoft.Json": {
         "type": "Direct",
@@ -94,17 +97,6 @@
           "NETStandard.Library": "1.6.0"
         }
       },
-      "OpenSearch.OpenSearch.Managed": {
-        "type": "Direct",
-        "requested": "[0.1.0-canary.0.277, )",
-        "resolved": "0.1.0-canary.0.277",
-        "contentHash": "BoLSf2fiCphayR0TQulvm0m0MISy8kCL+JrPv1QGrlR4YujWAeSi0izb+vnYEWT9+a8IviTMjU2TGZwpcKSuBQ==",
-        "dependencies": {
-          "OpenSearch.Stack.ArtifactsApi": "0.1.0-canary.0.277",
-          "Proc": "0.6.1",
-          "System.Net.Http": "4.3.4"
-        }
-      },
       "Proc": {
         "type": "Direct",
         "requested": "[0.6.1, )",
@@ -174,6 +166,11 @@
         "resolved": "1.1.0",
         "contentHash": "aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg=="
       },
+      "Microsoft.NETFramework.ReferenceAssemblies.net461": {
+        "type": "Transitive",
+        "resolved": "1.0.0-preview.2",
+        "contentHash": "59D9ISjzCpfHG41r5x4BNZNNOCmE2o5YX8vcdOwsqfxOA0+6vQnxZrYq8KtthUU2JSvC13g941rSr5GRaNQOJg=="
+      },
       "Microsoft.Win32.Primitives": {
         "type": "Transitive",
         "resolved": "4.3.0",
@@ -250,17 +247,6 @@
           "System.Xml.XDocument": "4.0.11"
         }
       },
-      "OpenSearch.Stack.ArtifactsApi": {
-        "type": "Transitive",
-        "resolved": "0.1.0-canary.0.277",
-        "contentHash": "S3Mxf2FhxL/WJg9f0LGoGLmpvRyFCH0HitsC3bDAgBweO9aqSNmpVeAm7DvKHMwGpSAglUL0+pOBvo2dCi/iVg==",
-        "dependencies": {
-          "SemanticVersioning": "0.8.0",
-          "System.Net.Http": "4.3.4",
-          "System.Runtime.InteropServices.RuntimeInformation": "4.3.0",
-          "System.Text.Json": "6.0.5"
-        }
-      },
       "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": {
         "type": "Transitive",
         "resolved": "4.3.2",
@@ -1255,6 +1241,23 @@
           "System.Threading": "4.0.11",
           "System.Xml.ReaderWriter": "4.0.11"
         }
+      },
+      "opensearch.opensearch.managed": {
+        "type": "Project",
+        "dependencies": {
+          "OpenSearch.Stack.ArtifactsApi": "1.0.0",
+          "Proc": "0.6.1",
+          "System.Net.Http": "4.3.4"
+        }
+      },
+      "opensearch.stack.artifactsapi": {
+        "type": "Project",
+        "dependencies": {
+          "SemanticVersioning": "0.8.0",
+          "System.Net.Http": "4.3.4",
+          "System.Runtime.InteropServices.RuntimeInformation": "4.3.0",
+          "System.Text.Json": "6.0.5"
+        }
       }
     }
   }

build/scripts/scripts.fsproj

@@ -37,7 +37,7 @@
     <PackageReference Include="FSharp.Core" Version="5.0.0" />
 
     <PackageReference Include="Bullseye" Version="3.3.0" />
-    <PackageReference Include="OpenSearch.OpenSearch.Managed" Version="0.1.0-canary.0.277" />
+    <ProjectReference Include="$(SolutionRoot)\abstractions\src\OpenSearch.OpenSearch.Managed\OpenSearch.OpenSearch.Managed.csproj" />
 
     <PackageReference Include="Fake.Core.Environment" Version="5.15.0" />
     <PackageReference Include="Fake.Core.SemVer" Version="5.15.0" />

nuget.config

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
 	<packageSources>
-		<add key="Local" value="packages" />
 		<add key="NuGet official package source" value="https://api.nuget.org/v3/index.json" />
 	</packageSources>
-</configuration>
+</configuration>