Skip to content

Commit e99f311

Browse files
EvilLord666EvilLord666
committed
Merge branch 'release/v1.1'
2 parents 737d738 + 66d8546 commit e99f311

File tree

47 files changed

+579
-92
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+579
-92
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -348,3 +348,5 @@ MigrationBackup/
348348

349349
# Ionide (cross platform F# VS Code tools) working folder
350350
.ionide/
351+
352+
Wissance.MossbauerLab.Watcher/Wissance.MossbauerLab.Watcher.Web/Wissance.MossbauerLab.Watcher.db

Wissance.MossbauerLab.Watcher/Wissance.MossbauerLab.Watcher/Config/MailConfig.cs renamed to Wissance.MossbauerLab.Watcher/Wissance.MossbauerLab.Watcher.Common/Data/Notification/MailSendRequisites.cs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
using System;
22
using System.Collections.Generic;
3-
using System.Globalization;
4-
using System.Linq;
5-
using System.Threading.Tasks;
3+
using System.Text;
64

7-
namespace Wissance.MossbauerLab.Watcher.Web.Config
5+
namespace Wissance.MossbauerLab.Watcher.Common.Data.Notification
86
{
9-
public class MailConfig
7+
public class MailSendRequisites
108
{
11-
public MailConfig()
9+
public MailSendRequisites()
1210
{
1311

1412
}
1513

16-
public MailConfig(string host, int port, string sender, string password, string[] recipients)
14+
public MailSendRequisites(string host, int port, string sender, string password, string[] recipients)
1715
{
1816
Host = host;
1917
Port = port;

‎Wissance.MossbauerLab.Watcher/Wissance.MossbauerLab.Watcher.Common/Data/Notification/TelegramSendRequisites.cs‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Text;
4+
5+
namespace Wissance.MossbauerLab.Watcher.Common.Data.Notification
6+
{
7+
public class TelegramSendRequisites
8+
{
9+
public TelegramSendRequisites()
10+
{
11+
}
12+
13+
public TelegramSendRequisites(string group, string botKey, string templateFilePath)
14+
{
15+
Group = group;
16+
BotKey = botKey;
17+
TemplateFilePath = templateFilePath;
18+
}
19+
20+
public string Group { get; set; }
21+
public string BotKey { get; set; }
22+
public string TemplateFilePath { get; set; }
23+
}
24+
}

Wissance.MossbauerLab.Watcher/Wissance.MossbauerLab.Watcher/Data/Sm2201SpectrumNameData.cs renamed to Wissance.MossbauerLab.Watcher/Wissance.MossbauerLab.Watcher.Common/Data/Sm2201SpectrumNameData.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using System.Linq;
44
using System.Threading.Tasks;
55

6-
namespace Wissance.MossbauerLab.Watcher.Web.Data
6+
namespace Wissance.MossbauerLab.Watcher.Common.Data
77
{
88
public class Sm2201SpectrumNameData
99
{

Wissance.MossbauerLab.Watcher/Wissance.MossbauerLab.Watcher/Data/SpectrumReadyData.cs renamed to Wissance.MossbauerLab.Watcher/Wissance.MossbauerLab.Watcher.Common/Data/SpectrumReadyData.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using System.Linq;
55
using System.Threading.Tasks;
66

7-
namespace Wissance.MossbauerLab.Watcher.Web.Data
7+
namespace Wissance.MossbauerLab.Watcher.Common.Data
88
{
99
public class SpectrumReadyData
1010
{

Wissance.MossbauerLab.Watcher/Wissance.MossbauerLab.Watcher/Utils/Sm2201SpectrumNameParser.cs renamed to Wissance.MossbauerLab.Watcher/Wissance.MossbauerLab.Watcher.Common/Utils/Sm2201SpectrumNameParser.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
using System.Globalization;
44
using System.Linq;
55
using System.Threading.Tasks;
6-
using Wissance.MossbauerLab.Watcher.Web.Data;
76

8-
namespace Wissance.MossbauerLab.Watcher.Web.Utils
7+
using Wissance.MossbauerLab.Watcher.Common.Data;
8+
9+
namespace Wissance.MossbauerLab.Watcher.Common.Utils
910
{
1011
public static class Sm2201SpectrumNameParser
1112
{

‎Wissance.MossbauerLab.Watcher/Wissance.MossbauerLab.Watcher.Common/Wissance.MossbauerLab.Watcher.Common.csproj‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>netcoreapp3.1</TargetFramework>
5+
</PropertyGroup>
6+
7+
<ItemGroup>
8+
<Compile Remove="Config\**" />
9+
<EmbeddedResource Remove="Config\**" />
10+
<None Remove="Config\**" />
11+
</ItemGroup>
12+
13+
</Project>

‎Wissance.MossbauerLab.Watcher/Wissance.MossbauerLab.Watcher.Data/Entities/SpectrumEntity.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public SpectrumEntity(string name, string description, string location, DateTime
1616
Name = name;
1717
Description = description;
1818
Location = location;
19-
measureStartDate = MeasureStartDate;
19+
MeasureStartDate = measureStartDate;
2020
First = first;
2121
Last = last;
2222
}

Wissance.MossbauerLab.Watcher/Wissance.MossbauerLab.Watcher/Extensions/ServiceCollectionExtension.cs renamed to Wissance.MossbauerLab.Watcher/Wissance.MossbauerLab.Watcher.Data/Extensions/ServiceCollectionExtension.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22
using System.Collections.Generic;
33
using System.Linq;
44
using System.Threading.Tasks;
5+
56
using Microsoft.EntityFrameworkCore;
67
using Microsoft.Extensions.DependencyInjection;
78

8-
namespace Wissance.MossbauerLab.Watcher.Web.Extensions
9+
namespace Wissance.MossbauerLab.Watcher.Common.Extensions
910
{
1011
public static class ServiceCollectionExtension
1112
{

‎Wissance.MossbauerLab.Watcher/Wissance.MossbauerLab.Watcher.Data/Wissance.MossbauerLab.Watcher.Data.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
<ItemGroup>
88
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.17" />
9+
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="5.0.17" />
910
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.17" />
1011
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.17">
1112
<PrivateAssets>all</PrivateAssets>

0 commit comments

Comments
 (0)