Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

1.5 Release WattTime v3 #538

Closed
wants to merge 2 commits into from
Closed

1.5 Release WattTime v3 #538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90a4ea6
Release 1.4 ( .net 8 upgrade) (#518)
danuw May 14, 2024
0205f46
Merge branch 'main' into Merge-conflicts-resolved-for-WattTime-v3-Upd…
vaughanknight Jul 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ For more details, checkout [https://github.com/Green-Software-Foundation/carbon-




## [1.4.0] - 2024-05

### Added
Expand Down
7 changes: 1 addition & 6 deletions src/CarbonAware.WebApi/src/CarbonAware.WebApi.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@
<NoWarn>1591</NoWarn>
</PropertyGroup>

<ItemGroup>
<Content Remove="appsettings.Development.json" />
</ItemGroup>


<ItemGroup>
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="8.0.0-rc.1.23419.4" />
Expand Down Expand Up @@ -51,7 +49,4 @@
<Folder Include="api\v1" />
</ItemGroup>

<ItemGroup>
<None Include="appsettings.Development.json" />
</ItemGroup>
</Project>
1 change: 1 addition & 0 deletions src/GSF.CarbonAware/src/Configuration/ServiceCollectionExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ private static IServiceCollection ConfigureLocationDataSourcesConfiguration(thi
/// </summary>
public static IServiceCollection AddEmissionsServices(this IServiceCollection services, IConfiguration configuration)
{

AddLocationService(services, configuration);
services.AddDataSourceService(configuration);
services.TryAddSingleton<IEmissionsHandler, EmissionsHandler>();
Expand Down
Loading