Merge branch 'main' into dev

Signed-off-by: Vaughan Knight <[email protected]>
Green-Software-Foundation · Jul 23, 2024 · 4123038 · 4123038
2 parents fd2f560 + 90a4ea6
commit 4123038
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -76,8 +76,6 @@ No changes
 For more details, checkout [https://github.com/Green-Software-Foundation/carbon-aware-sdk/issues/503](https://github.com/Green-Software-Foundation/carbon-aware-sdk/issues/503) 
 
 
-
-
 ## [1.4.0] - 2024-05
 
 ### Added 

diff --git a/src/CarbonAware.WebApi/src/CarbonAware.WebApi.csproj b/src/CarbonAware.WebApi/src/CarbonAware.WebApi.csproj
@@ -15,13 +15,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Content Remove="appsettings.Development.json" />
-  </ItemGroup>
 
-  <ItemGroup>
     <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="8.0.0-rc.1.23419.4" />
     <PackageReference Include="Opentelemetry.Exporter.Prometheus.AspNetCore" Version="1.6.0-rc.1" />
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.14.0" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets"
+      Version="1.14.0" />
     <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.6.0" />
     <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.6.0" />
     <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.5.1-beta.1" />
@@ -51,7 +49,4 @@
     <Folder Include="api\v1" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Include="appsettings.Development.json" />
-  </ItemGroup>
 </Project>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -76,8 +76,6 @@ No changes
		For more details, checkout [https://github.com/Green-Software-Foundation/carbon-aware-sdk/issues/503](https://github.com/Green-Software-Foundation/carbon-aware-sdk/issues/503)




		## [1.4.0] - 2024-05

		### Added
Expand Down