Merge pull request #41 from Bit-Quill/dev-os-2.0-integ-local-abstract…

…ions-no-build

Integrate abstractions projects into client build.

Directory.Build.props

@@ -22,6 +22,7 @@
     <PackageReleaseNotes>See https://github.com/opensearch-project/opensearch-net/releases</PackageReleaseNotes>
     <PackageProjectUrl>https://github.com/opensearch-project/opensearch-net</PackageProjectUrl>
     <PackageIconUrl>https://raw.githubusercontent.com/opensearch-project/opensearch-net/main/build/nuget-icon.png</PackageIconUrl>
+    <RepositoryType>Git</RepositoryType>
   </PropertyGroup>
 
   <PropertyGroup>

Directory.Build.targets

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

OpenSearch.sln

@@ -12,10 +12,10 @@ EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "scripts", "build\scripts\scripts.fsproj", "{D6997ADC-E933-418E-831C-DE1A78897493}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{6C4A2627-AF22-4388-9DF7-7A9AEACFD635}"
-ProjectSection(SolutionItems) = preProject
-	tests\Directory.Build.props = tests\Directory.Build.props
-	tests\.runsettings = tests\.runsettings
-EndProjectSection
+	ProjectSection(SolutionItems) = preProject
+		tests\Directory.Build.props = tests\Directory.Build.props
+		tests\.runsettings = tests\.runsettings
+	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "tests\Tests\Tests.csproj", "{5B393962-7586-49BA-BD99-3B1E35F48E94}"
 EndProject
@@ -32,47 +32,66 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests.ScratchPad", "tests\Tests.ScratchPad\Tests.ScratchPad.csproj", "{CE7AC1D4-15AF-47FB-83FA-F7137DFD9076}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Root", "Root", "{EAE89579-CCA9-45CE-AF83-3DCD98690EA8}"
-ProjectSection(SolutionItems) = preProject
-	.editorconfig = .editorconfig
-	.gitignore = .gitignore
-	global.json = global.json
-	nuget.config = nuget.config
-	dotnet-tools.json = dotnet-tools.json
-EndProjectSection
+	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
+		.gitignore = .gitignore
+		global.json = global.json
+		nuget.config = nuget.config
+		dotnet-tools.json = dotnet-tools.json
+	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Markdown", "Markdown", "{2FABB663-F4DB-499A-89F8-3A08828D1D91}"
-ProjectSection(SolutionItems) = preProject
-	admins.md = admins.md
-	code_of_conduct.md = code_of_conduct.md
-	compatibility.md = compatibility.md
-	contributing.md = contributing.md
-	maintainers.md = maintainers.md
-	license.txt = license.txt
-	readme.md = readme.md
-	releasing.md = releasing.md
-	security.md = security.md
-	user_guide.md = user_guide.md
-EndProjectSection
+	ProjectSection(SolutionItems) = preProject
+		admins.md = admins.md
+		code_of_conduct.md = code_of_conduct.md
+		compatibility.md = compatibility.md
+		contributing.md = contributing.md
+		maintainers.md = maintainers.md
+		license.txt = license.txt
+		readme.md = readme.md
+		releasing.md = releasing.md
+		security.md = security.md
+		user_guide.md = user_guide.md
+	EndProjectSection
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Tests.YamlRunner", "tests\Tests.YamlRunner\Tests.YamlRunner.fsproj", "{81473437-5722-4829-A5CD-125B17CCA238}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{3EA11364-0513-44B7-AD6D-A675485E7448}"
-ProjectSection(SolutionItems) = preProject
-	src\_PublishArtifacts.Build.props = src\_PublishArtifacts.Build.props
-EndProjectSection
+	ProjectSection(SolutionItems) = preProject
+		src\_PublishArtifacts.Build.props = src\_PublishArtifacts.Build.props
+	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ApiGenerator", "src\ApiGenerator\ApiGenerator.csproj", "{CA508E92-50AE-4858-BD94-8637E88A8FAC}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSearch.Net.VirtualizedCluster", "src\OpenSearch.Net.VirtualizedCluster\OpenSearch.Net.VirtualizedCluster.csproj", "{CFE97627-8DD3-470B-B7CF-78B62E1D305D}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{29E53C13-34F7-4F0D-8D28-41EF768793E7}"
-ProjectSection(SolutionItems) = preProject
-	Directory.Build.props = Directory.Build.props
-	Directory.Build.targets = Directory.Build.targets
-EndProjectSection
+	ProjectSection(SolutionItems) = preProject
+		Directory.Build.props = Directory.Build.props
+		Directory.Build.targets = Directory.Build.targets
+	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSearch.Client.JsonNetSerializer", "src\OpenSearch.Client.JsonNetSerializer\OpenSearch.Client.JsonNetSerializer.csproj", "{B16AAB37-9FF4-4940-AC7D-437DFD18A6F6}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSearch.Stack.ArtifactsApiTests", "abstractions\src\OpenSearch.Stack.ArtifactsApiTests\OpenSearch.Stack.ArtifactsApiTests.csproj", "{1F5A7B1A-2566-481F-91B5-A63D7F939973}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "abstractions", "abstractions", "{87ABA679-F3F4-48CE-82B3-1AAE5D0A5935}"
+	ProjectSection(SolutionItems) = preProject
+		abstractions\README.md = abstractions\README.md
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{ABE3B7EE-5B31-4C9A-976A-AD28D257B147}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSearch.OpenSearch.Ephemeral", "abstractions\src\OpenSearch.OpenSearch.Ephemeral\OpenSearch.OpenSearch.Ephemeral.csproj", "{31668B33-6157-4A5B-8D4C-18AF760DCA1B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSearch.OpenSearch.EphemeralTests", "abstractions\src\OpenSearch.OpenSearch.EphemeralTests\OpenSearch.OpenSearch.EphemeralTests.csproj", "{C80D225C-F072-4B24-9ACE-82EFD9362237}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSearch.OpenSearch.Managed", "abstractions\src\OpenSearch.OpenSearch.Managed\OpenSearch.OpenSearch.Managed.csproj", "{A9125BAC-71B5-4DC8-879D-1154A0A7DE5C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSearch.OpenSearch.Xunit", "abstractions\src\OpenSearch.OpenSearch.Xunit\OpenSearch.OpenSearch.Xunit.csproj", "{39B7E62B-BDDF-46F2-9306-CE5FC68573A2}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSearch.Stack.ArtifactsApi", "abstractions\src\OpenSearch.Stack.ArtifactsApi\OpenSearch.Stack.ArtifactsApi.csproj", "{E7C0BDC2-28AD-4582-8FEA-0F6327A42C0E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -102,6 +121,12 @@ Global
 		{D6997ADC-E933-418E-831C-DE1A78897493} = {29E53C13-34F7-4F0D-8D28-41EF768793E7}
 		{432D5575-2347-4D3C-BF8C-3E38410C46CA} = {29E53C13-34F7-4F0D-8D28-41EF768793E7}
 		{B16AAB37-9FF4-4940-AC7D-437DFD18A6F6} = {3EA11364-0513-44B7-AD6D-A675485E7448}
+		{ABE3B7EE-5B31-4C9A-976A-AD28D257B147} = {87ABA679-F3F4-48CE-82B3-1AAE5D0A5935}
+		{31668B33-6157-4A5B-8D4C-18AF760DCA1B} = {ABE3B7EE-5B31-4C9A-976A-AD28D257B147}
+		{C80D225C-F072-4B24-9ACE-82EFD9362237} = {ABE3B7EE-5B31-4C9A-976A-AD28D257B147}
+		{A9125BAC-71B5-4DC8-879D-1154A0A7DE5C} = {ABE3B7EE-5B31-4C9A-976A-AD28D257B147}
+		{39B7E62B-BDDF-46F2-9306-CE5FC68573A2} = {ABE3B7EE-5B31-4C9A-976A-AD28D257B147}
+		{E7C0BDC2-28AD-4582-8FEA-0F6327A42C0E} = {ABE3B7EE-5B31-4C9A-976A-AD28D257B147}
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{5B393962-7586-49BA-BD99-3B1E35F48E94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -164,5 +189,29 @@ Global
 		{B16AAB37-9FF4-4940-AC7D-437DFD18A6F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B16AAB37-9FF4-4940-AC7D-437DFD18A6F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B16AAB37-9FF4-4940-AC7D-437DFD18A6F6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1F5A7B1A-2566-481F-91B5-A63D7F939973}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1F5A7B1A-2566-481F-91B5-A63D7F939973}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1F5A7B1A-2566-481F-91B5-A63D7F939973}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1F5A7B1A-2566-481F-91B5-A63D7F939973}.Release|Any CPU.Build.0 = Release|Any CPU
+		{31668B33-6157-4A5B-8D4C-18AF760DCA1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{31668B33-6157-4A5B-8D4C-18AF760DCA1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{31668B33-6157-4A5B-8D4C-18AF760DCA1B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{31668B33-6157-4A5B-8D4C-18AF760DCA1B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C80D225C-F072-4B24-9ACE-82EFD9362237}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C80D225C-F072-4B24-9ACE-82EFD9362237}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C80D225C-F072-4B24-9ACE-82EFD9362237}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C80D225C-F072-4B24-9ACE-82EFD9362237}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A9125BAC-71B5-4DC8-879D-1154A0A7DE5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A9125BAC-71B5-4DC8-879D-1154A0A7DE5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A9125BAC-71B5-4DC8-879D-1154A0A7DE5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A9125BAC-71B5-4DC8-879D-1154A0A7DE5C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{39B7E62B-BDDF-46F2-9306-CE5FC68573A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{39B7E62B-BDDF-46F2-9306-CE5FC68573A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{39B7E62B-BDDF-46F2-9306-CE5FC68573A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{39B7E62B-BDDF-46F2-9306-CE5FC68573A2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E7C0BDC2-28AD-4582-8FEA-0F6327A42C0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E7C0BDC2-28AD-4582-8FEA-0F6327A42C0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E7C0BDC2-28AD-4582-8FEA-0F6327A42C0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E7C0BDC2-28AD-4582-8FEA-0F6327A42C0E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal

abstractions/README.md

@@ -1,21 +1,16 @@
-![OpenSearch logo](OpenSearch.svg)
+![OpenSearch logo](../OpenSearch.svg)
 
 - [OpenSearch .NET abstractions](#opensearch-net-abstractions)
     - [OpenSearch.OpenSearch.Managed](#opensearchopensearchmanaged)
     - [OpenSearch.OpenSearch.Ephemeral](#opensearchopensearchephemeral)
     - [OpenSearch.OpenSearch.Xunit](#opensearchopensearchxunit)
     - [OpenSearch.Stack.ArtifactsApi](#opensearchstackartifactsapi)
-- [Project Resources](#project-resources)
-- [Code of Conduct](#code-of-conduct)
-- [Security](#security)
-- [License](#license)
-- [Copyright](#copyright)
 
 ## Welcome!
 
 # OpenSearch .NET abstractions
 
-You've reached the home repository for several auxiliary projects from the .NET team within OpenSearch.
+You've reached the home for several auxiliary projects from the .NET team within OpenSearch.
 
 Current projects:
 
@@ -49,29 +44,3 @@ Supports:
 2. Released versions
     * `MAJOR.MINOR.PATH` where `MAJOR` is still supported as defined by the EOL policy of OpenSearch.
     * Note if the version exists but is not yet released it will resolve as a build candidate
-
-## Project Resources
-
-* [Project Website](https://opensearch.org/)
-* Need help? Try [Forums](https://discuss.opendistrocommunity.dev/)
-* [Project Principles](https://opensearch.org/#principles)
-* [Contributing to OpenSearch](CONTRIBUTING.md)
-* [Maintainer Responsibilities](MAINTAINERS.md)
-* [Release Management](RELEASING.md)
-* [Admin Responsibilities](ADMINS.md)
-* [Security](SECURITY.md)
-
-## Code of Conduct
-
-This project has adopted the [Amazon Open Source Code of Conduct](CODE_OF_CONDUCT.md). For more information see the [Code of Conduct FAQ](https://aws.github.io/code-of-conduct-faq), or contact [[email protected]](mailto:[email protected]) with any additional questions or comments.
-
-## Security
-If you discover a potential security issue in this project we ask that you notify AWS/Amazon Security via our [vulnerability reporting page](http://aws.amazon.com/security/vulnerability-reporting/) or directly via email to [email protected]. Please do **not** create a public GitHub issue.
-
-## License
-
-This project is licensed under the [Apache v2.0 License](LICENSE.txt).
-
-## Copyright
-
-Copyright OpenSearch Contributors. See [NOTICE](NOTICE.txt) for details.