Moving folder structure

Cloudflare/Cloudflare.csproj

@@ -1,62 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
-    <NrtTagMatch>v[0-9]*</NrtTagMatch>
-    <NrtRevisionFormat>{semvertag:main}{!:-dev}</NrtRevisionFormat>
-    <Nullable>enable</Nullable>
-
-    <AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
-    <CopyRefAssembliesToPublishDirectory>false</CopyRefAssembliesToPublishDirectory>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-
-    <PackageIcon>package-icon.png</PackageIcon>
-    <PackageReadmeFile>README.md</PackageReadmeFile>
-    <PackageTags>cloudflare api</PackageTags>
-    <PackageProjectUrl>https://developers.cloudflare.com/api</PackageProjectUrl>
-    <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
-
-    <IncludeSymbols>true</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <EmbedUntrackedSources>false</EmbedUntrackedSources>
-    
-    <PackageId>AMWD.Net.API.Cloudflare</PackageId>
-    <AssemblyName>amwd-cloudflare-core</AssemblyName>
-    <RootNamespace>AMWD.Net.Api.Cloudflare</RootNamespace>
-
-    <Product>Cloudflare API - Core</Product>
-    <Description>Core features of the Cloudflare API</Description>
-  </PropertyGroup>
-
-  <!-- Only build package for tagged releases or Debug on CI (only dev NuGet feed) -->
-  <!--<PropertyGroup Condition="$([System.Text.RegularExpressions.Regex]::IsMatch('$(CI_COMMIT_TAG)', '^v[0-9.]+')) or ('$(Configuration)' == 'Debug' and '$(GITLAB_CI)' == 'true')">-->
-  <PropertyGroup Condition="$([System.Text.RegularExpressions.Regex]::IsMatch('$(CI_COMMIT_TAG)', '^v[0-9.]+')) or ('$(Configuration)' == 'Debug')">
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(GITLAB_CI)' == 'true'">
-    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
-  </PropertyGroup>
-
-  <ItemGroup Condition="'$(GITLAB_CI)' == 'true'">
-    <SourceLinkGitLabHost Include="$(CI_SERVER_HOST)" Version="$(CI_SERVER_VERSION)" />
-    <PackageReference Include="Microsoft.SourceLink.GitLab" Version="8.0.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Include="$(SolutionDir)/package-icon.png" Pack="true" PackagePath="/" />
-    <None Include="$(SolutionDir)/LICENSE.txt" Pack="true" PackagePath="/" />
-    <None Include="README.md" Pack="true" PackagePath="/" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="AMWD.NetRevisionTask" Version="1.2.1">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-
-</Project>

Directory.Build.props

@@ -6,21 +6,15 @@
     <RepositoryUrl>https://github.com/AM-WD/cloudflare-api.git</RepositoryUrl>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
 
-    <Title>Modular Cloudflare API implementation in .NET</Title>
-    <Company>AM.WD</Company>
-    <Authors>Andreas Müller</Authors>
-    <Copyright>© {copyright:2025-} AM.WD</Copyright>
+    <PublicKey>00240000048000009400000006020000002400005253413100040000010001005d36da5b1ce821f80e6ec0f2b0d909de7f7fcbd3e59d01f0df660453bde3df65ce571562c540f16f50a3c900e2beacffbe6670443b5bbae62b7f297cd02ab4484a9e2f48e1c6250f684612df57ac7ff6684d040948622da556586229b9f5b562e6f65cf3e83e49ca165bd32cbba8a6015bf6fcd2ccfc0e0cb5d1d9e2449543f1</PublicKey>
 
-    <PublicKey>0024000004800000940000000602000000240000525341310004000001000100a96b0435a48fcae5d097c19c0c3a312d0316c1217a7d5984236f430625510dfdbedc3ffdaea7b3bad77adbe5d85cecdd788a43cd02a8a4950313587bbcb804ff2ef68346f9d6a79f79338e4f12293f216df0536d2b05ab7977b6c50946a42422cb1ddc109c0151a3d65fbe636ce6734070fb6e3eaf000a33ac6a36cab5292ed1</PublicKey>
-  </PropertyGroup>
-
-  <PropertyGroup>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>$(SolutionDir)/cloudflare-api.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3"/>
+
     <Using Include="Newtonsoft.Json"/>
     <Using Include="System"/>
     <Using Include="System.Collections.Generic"/>

UnitTests/Cloudflare.Zones.Tests/Cloudflare.Zones.Tests.csproj

@@ -1,11 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="$(SolutionDir)\Extensions\Cloudflare.Zones\Cloudflare.Zones.csproj" />
-  </ItemGroup>
-
-</Project>

UnitTests/Directory.Build.props

@@ -1,28 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <IsPackable>false</IsPackable>
-    <IsTestProject>true</IsTestProject>
-    <CollectCoverage>true</CollectCoverage>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="coverlet.msbuild" Version="6.0.2">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-    <PackageReference Include="Moq" Version="4.20.72" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.6.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.6.1" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Using Include="Microsoft.VisualStudio.TestTools.UnitTesting" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="$(SolutionDir)\Cloudflare\Cloudflare.csproj" />
-  </ItemGroup>
-
-  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
-</Project>

cloudflare-api.sln

@@ -3,22 +3,25 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.10.35013.160
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cloudflare", "Cloudflare\Cloudflare.csproj", "{9D98650A-01CC-44B1-AC1E-D6323E1777C5}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F775D5D5-4466-4821-B28B-444828937810}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{5D69F102-CF03-4175-8C59-D457450B28E0}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extensions", "Extensions", "{EE760850-ED97-4493-B0AE-326289A60145}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
 	ProjectSection(SolutionItems) = preProject
-		Extensions\Directory.Build.props = Extensions\Directory.Build.props
+		src\Directory.Build.props = src\Directory.Build.props
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{BA35336B-7640-4C0C-B93E-06BDC1EE1872}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{03EFEF88-1C02-43BD-BAF2-6E3583E176DD}"
+	ProjectSection(SolutionItems) = preProject
+		test\Directory.Build.props = test\Directory.Build.props
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{DB52006F-77DA-41A7-BF1E-E7FADA392216}"
 	ProjectSection(SolutionItems) = preProject
 		.gitlab-ci.yml = .gitlab-ci.yml
 		Directory.Build.props = Directory.Build.props
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "config", "config", "{E72A0B89-A37E-4BB3-B2EF-26AB24D3D716}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "config", "config", "{95693042-95D1-4653-8CE4-E0CA49671FDD}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
 		.gitignore = .gitignore
@@ -26,7 +29,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "config", "config", "{E72A0B
 		nuget.config = nuget.config
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{5AF54083-1A93-4C43-B36C-EDD9E5DE0695}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{B3E7C9D0-6C31-4315-BD12-5C09E779930E}"
 	ProjectSection(SolutionItems) = preProject
 		CHANGELOG.md = CHANGELOG.md
 		LICENSE.txt = LICENSE.txt
@@ -34,16 +37,20 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{5AF54083-1
 		README.md = README.md
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UnitTests", "UnitTests", "{A31B4929-190B-4AB8-984B-E284BB159F04}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extensions", "Extensions", "{CC6F1A0E-F7BC-47D0-AB42-0DFC02D0CB46}"
 	ProjectSection(SolutionItems) = preProject
-		UnitTests\Directory.Build.props = UnitTests\Directory.Build.props
+		src\Extensions\Directory.Build.props = src\Extensions\Directory.Build.props
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cloudflare.Tests", "Cloudflare.Tests\Cloudflare.Tests.csproj", "{2491D707-E845-49DF-8D94-0154AAD36E42}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extensions", "Extensions", "{B949CF48-2F6B-491F-A0D3-502204D52BA5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cloudflare.Zones", "Extensions\Cloudflare.Zones\Cloudflare.Zones.csproj", "{82ADFF73-94FF-44D0-8239-A8FF5809A600}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cloudflare", "src\Cloudflare\Cloudflare.csproj", "{710FB8C2-6B49-43C6-9A48-FA9FA2F75833}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cloudflare.Zones.Tests", "UnitTests\Cloudflare.Zones.Tests\Cloudflare.Zones.Tests.csproj", "{592B8AA2-9888-407B-98A4-CCD68A1C7C9A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cloudflare.Tests", "test\Cloudflare.Tests\Cloudflare.Tests.csproj", "{05CEDEA7-5967-6805-4145-82C5E3D7942F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cloudflare.Zones", "src\Extensions\Cloudflare.Zones\Cloudflare.Zones.csproj", "{B68AF597-98BA-C7A2-9624-CA306B1BC086}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cloudflare.Zones.Tests", "test\Extensions\Cloudflare.Zones.Tests\Cloudflare.Zones.Tests.csproj", "{F9684EAD-B1AA-6410-0577-36758907BF5C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -51,32 +58,36 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{9D98650A-01CC-44B1-AC1E-D6323E1777C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9D98650A-01CC-44B1-AC1E-D6323E1777C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9D98650A-01CC-44B1-AC1E-D6323E1777C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9D98650A-01CC-44B1-AC1E-D6323E1777C5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2491D707-E845-49DF-8D94-0154AAD36E42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2491D707-E845-49DF-8D94-0154AAD36E42}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2491D707-E845-49DF-8D94-0154AAD36E42}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2491D707-E845-49DF-8D94-0154AAD36E42}.Release|Any CPU.Build.0 = Release|Any CPU
-		{82ADFF73-94FF-44D0-8239-A8FF5809A600}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{82ADFF73-94FF-44D0-8239-A8FF5809A600}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{82ADFF73-94FF-44D0-8239-A8FF5809A600}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{82ADFF73-94FF-44D0-8239-A8FF5809A600}.Release|Any CPU.Build.0 = Release|Any CPU
-		{592B8AA2-9888-407B-98A4-CCD68A1C7C9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{592B8AA2-9888-407B-98A4-CCD68A1C7C9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{592B8AA2-9888-407B-98A4-CCD68A1C7C9A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{592B8AA2-9888-407B-98A4-CCD68A1C7C9A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{710FB8C2-6B49-43C6-9A48-FA9FA2F75833}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{710FB8C2-6B49-43C6-9A48-FA9FA2F75833}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{710FB8C2-6B49-43C6-9A48-FA9FA2F75833}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{710FB8C2-6B49-43C6-9A48-FA9FA2F75833}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B68AF597-98BA-C7A2-9624-CA306B1BC086}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B68AF597-98BA-C7A2-9624-CA306B1BC086}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B68AF597-98BA-C7A2-9624-CA306B1BC086}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B68AF597-98BA-C7A2-9624-CA306B1BC086}.Release|Any CPU.Build.0 = Release|Any CPU
+		{05CEDEA7-5967-6805-4145-82C5E3D7942F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{05CEDEA7-5967-6805-4145-82C5E3D7942F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{05CEDEA7-5967-6805-4145-82C5E3D7942F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{05CEDEA7-5967-6805-4145-82C5E3D7942F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F9684EAD-B1AA-6410-0577-36758907BF5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F9684EAD-B1AA-6410-0577-36758907BF5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F9684EAD-B1AA-6410-0577-36758907BF5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F9684EAD-B1AA-6410-0577-36758907BF5C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{BA35336B-7640-4C0C-B93E-06BDC1EE1872} = {5D69F102-CF03-4175-8C59-D457450B28E0}
-		{E72A0B89-A37E-4BB3-B2EF-26AB24D3D716} = {5D69F102-CF03-4175-8C59-D457450B28E0}
-		{5AF54083-1A93-4C43-B36C-EDD9E5DE0695} = {5D69F102-CF03-4175-8C59-D457450B28E0}
-		{82ADFF73-94FF-44D0-8239-A8FF5809A600} = {EE760850-ED97-4493-B0AE-326289A60145}
-		{592B8AA2-9888-407B-98A4-CCD68A1C7C9A} = {A31B4929-190B-4AB8-984B-E284BB159F04}
+		{710FB8C2-6B49-43C6-9A48-FA9FA2F75833} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
+		{CC6F1A0E-F7BC-47D0-AB42-0DFC02D0CB46} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
+		{B68AF597-98BA-C7A2-9624-CA306B1BC086} = {CC6F1A0E-F7BC-47D0-AB42-0DFC02D0CB46}
+		{05CEDEA7-5967-6805-4145-82C5E3D7942F} = {03EFEF88-1C02-43BD-BAF2-6E3583E176DD}
+		{B949CF48-2F6B-491F-A0D3-502204D52BA5} = {03EFEF88-1C02-43BD-BAF2-6E3583E176DD}
+		{F9684EAD-B1AA-6410-0577-36758907BF5C} = {B949CF48-2F6B-491F-A0D3-502204D52BA5}
+		{B3E7C9D0-6C31-4315-BD12-5C09E779930E} = {F775D5D5-4466-4821-B28B-444828937810}
+		{DB52006F-77DA-41A7-BF1E-E7FADA392216} = {F775D5D5-4466-4821-B28B-444828937810}
+		{95693042-95D1-4653-8CE4-E0CA49671FDD} = {F775D5D5-4466-4821-B28B-444828937810}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {A465B60D-C946-4381-835C-29303EA4FAD1}

src/Cloudflare/Cloudflare.csproj

@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
+    <NrtTagMatch>v[0-9]*</NrtTagMatch>
+
+    <PackageId>AMWD.Net.API.Cloudflare</PackageId>
+    <PackageTags>cloudflare api</PackageTags>
+
+    <AssemblyName>amwd-cloudflare-core</AssemblyName>
+    <RootNamespace>AMWD.Net.Api.Cloudflare</RootNamespace>
+
+    <Product>Cloudflare API - Core</Product>
+    <Description>Core features of the Cloudflare API</Description>
+  </PropertyGroup>
+
+  <!-- Only build package for tagged releases or Debug on CI (only dev NuGet feed) -->
+  <PropertyGroup Condition="$([System.Text.RegularExpressions.Regex]::IsMatch('$(CI_COMMIT_TAG)', '^v[0-9.]+')) or ('$(Configuration)' == 'Debug' and '$(GITLAB_CI)' == 'true')">
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+  </PropertyGroup>
+
+</Project>

src/Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
-    <NrtRevisionFormat>{semvertag:main}{!:-dev}</NrtRevisionFormat>
     <Nullable>enable</Nullable>
+    <NrtRevisionFormat>{semvertag:main}{!:-dev}</NrtRevisionFormat>
 
     <AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
     <CopyRefAssembliesToPublishDirectory>false</CopyRefAssembliesToPublishDirectory>
@@ -15,6 +15,11 @@
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <EmbedUntrackedSources>false</EmbedUntrackedSources>
+
+    <Title>Modular Cloudflare API implementation in .NET</Title>
+    <Company>AM.WD</Company>
+    <Authors>Andreas Müller</Authors>
+    <Copyright>© {copyright:2025-} AM.WD</Copyright>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(GITLAB_CI)' == 'true'">
@@ -29,10 +34,6 @@
     </PackageReference>
   </ItemGroup>
 
-  <ItemGroup>
-    <InternalsVisibleTo Include="DynamicProxyGenAssembly2" PublicKey="0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7" />
-  </ItemGroup>
-
   <ItemGroup>
     <None Include="$(SolutionDir)/package-icon.png" Pack="true" PackagePath="/" />
     <None Include="$(SolutionDir)/LICENSE.txt" Pack="true" PackagePath="/" />
@@ -46,13 +47,5 @@
     </PackageReference>
   </ItemGroup>
 
-  <ItemGroup Condition="'$(Configuration)' == 'Release'">
-    <!-- This package version has to be updated whenever the base API implementation changes. -->
-    <PackageReference Include="AMWD.Net.API.Cloudflare" Version="0.1.0" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(Configuration)' == 'Debug'">
-    <ProjectReference Include="$(SolutionDir)\Cloudflare\Cloudflare.csproj" />
-  </ItemGroup>
-
-  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)\..'))" />
 </Project>