Skip to content

Commit 41e052f

Browse files
RossBugginsNHSRossBugginsNHS
committed
rebased to main.
1 parent 27b849b commit 41e052f

File tree

3 files changed

+20
-83
lines changed

3 files changed

+20
-83
lines changed

‎.gitleaksignore‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,4 @@ b1f85a7faf54eaf66074d7a6daa093aefe6b3ebe:sdk/python/pyproject.toml:ipv4:25
1616
28aa8bcf42e1af50ab2541a345be851b53dd0f00:specification/api/notify-supplier.yml:generic-api-key:115
1717
93e54b6baa390529aab08d9fd956837f7bb3f30:src/src.sln:ipv4:3
1818
493e54b6baa390529aab08d9fd956837f7bb3f30:src/src.sln:ipv4:3
19-
<<<<<<< HEAD
2019
d8aaf7e033bf78fff491caa148897be266b60f67:src/src.sln:ipv4:3
21-
=======
22-
>>>>>>> d8aaf7e (Robu6/libs nuget example (#57))

‎src/server/host/Program.cs‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,11 @@
1111
builder.Configuration,
1212
suppliersApiBuilder =>
1313
{
14-
<<<<<<< HEAD
1514
suppliersApiBuilder
1615
.FromAssemblies()
1716
.ConfigureOptions(suppliersOptions =>
1817
{
1918
});
20-
=======
21-
suppliersApiBuilder.FromAssemblies();
22-
suppliersApiBuilder.ConfigureOptions(suppliersOptions =>
23-
{
24-
});
25-
>>>>>>> d8aaf7e (Robu6/libs nuget example (#57))
2619
});
2720

2821
var app = builder.Build();

‎src/server/server.sln‎

Lines changed: 20 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,15 @@
1-
<<<<<<< HEAD
2-

3-
Microsoft Visual Studio Solution File, Format Version 12.00
4-
# Visual Studio Version 17
5-
VisualStudioVersion = 17.0.31903.59
6-
MinimumVisualStudioVersion = 10.0.40219.1
7-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "letter", "letter\letter.csproj", "{C3C92596-1DE5-4DD6-B72F-9419CFFC5442}"
8-
EndProject
9-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "data", "data\data.csproj", "{919B3975-F504-4A5B-9853-EE8CDA834CF0}"
10-
EndProject
11-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "host", "host\host.csproj", "{28799552-4E08-4631-B27E-B2B65195CFFA}"
12-
EndProject
13-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "abstractions", "abstractions\abstractions.csproj", "{176BF6D5-5C0B-474D-8E7B-E1B798D8BA87}"
14-
EndProject
15-
Global
16-
GlobalSection(SolutionConfigurationPlatforms) = preSolution
17-
Debug|Any CPU = Debug|Any CPU
18-
Release|Any CPU = Release|Any CPU
19-
EndGlobalSection
20-
GlobalSection(SolutionProperties) = preSolution
21-
HideSolutionNode = FALSE
22-
EndGlobalSection
23-
GlobalSection(ProjectConfigurationPlatforms) = postSolution
24-
{C3C92596-1DE5-4DD6-B72F-9419CFFC5442}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
25-
{C3C92596-1DE5-4DD6-B72F-9419CFFC5442}.Debug|Any CPU.Build.0 = Debug|Any CPU
26-
{C3C92596-1DE5-4DD6-B72F-9419CFFC5442}.Release|Any CPU.ActiveCfg = Release|Any CPU
27-
{C3C92596-1DE5-4DD6-B72F-9419CFFC5442}.Release|Any CPU.Build.0 = Release|Any CPU
28-
{919B3975-F504-4A5B-9853-EE8CDA834CF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
29-
{919B3975-F504-4A5B-9853-EE8CDA834CF0}.Debug|Any CPU.Build.0 = Debug|Any CPU
30-
{919B3975-F504-4A5B-9853-EE8CDA834CF0}.Release|Any CPU.ActiveCfg = Release|Any CPU
31-
{919B3975-F504-4A5B-9853-EE8CDA834CF0}.Release|Any CPU.Build.0 = Release|Any CPU
32-
{28799552-4E08-4631-B27E-B2B65195CFFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
33-
{28799552-4E08-4631-B27E-B2B65195CFFA}.Debug|Any CPU.Build.0 = Debug|Any CPU
34-
{28799552-4E08-4631-B27E-B2B65195CFFA}.Release|Any CPU.ActiveCfg = Release|Any CPU
35-
{28799552-4E08-4631-B27E-B2B65195CFFA}.Release|Any CPU.Build.0 = Release|Any CPU
36-
{176BF6D5-5C0B-474D-8E7B-E1B798D8BA87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
37-
{176BF6D5-5C0B-474D-8E7B-E1B798D8BA87}.Debug|Any CPU.Build.0 = Debug|Any CPU
38-
{176BF6D5-5C0B-474D-8E7B-E1B798D8BA87}.Release|Any CPU.ActiveCfg = Release|Any CPU
39-
{176BF6D5-5C0B-474D-8E7B-E1B798D8BA87}.Release|Any CPU.Build.0 = Release|Any CPU
40-
EndGlobalSection
41-
EndGlobal
42-
=======
431

442
Microsoft Visual Studio Solution File, Format Version 12.00
453
# Visual Studio Version 17
464
VisualStudioVersion = 17.0.31903.59
475
MinimumVisualStudioVersion = 10.0.40219.1
48-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "abstractions", "abstractions\abstractions.csproj", "{3C2F563D-8CDE-427C-B5C6-83B2C6094942}"
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "letter", "letter\letter.csproj", "{C3C92596-1DE5-4DD6-B72F-9419CFFC5442}"
497
EndProject
50-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "host", "host\host.csproj", "{677DD50B-705B-41EA-9184-BAF6FD3B51AA}"
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "data", "data\data.csproj", "{919B3975-F504-4A5B-9853-EE8CDA834CF0}"
519
EndProject
52-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "letter", "letter", "{C765FCF7-579D-4518-9027-228A36B5873F}"
10+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "host", "host\host.csproj", "{28799552-4E08-4631-B27E-B2B65195CFFA}"
5311
EndProject
54-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "data", "data\data.csproj", "{87832A02-4849-4969-BCF5-04A1176DBFBD}"
55-
EndProject
56-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "letter", "letter\letter.csproj", "{AA5F5F27-00B4-4C49-A757-2EF75BD7339E}"
12+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "abstractions", "abstractions\abstractions.csproj", "{176BF6D5-5C0B-474D-8E7B-E1B798D8BA87}"
5713
EndProject
5814
Global
5915
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -64,30 +20,21 @@ Global
6420
HideSolutionNode = FALSE
6521
EndGlobalSection
6622
GlobalSection(ProjectConfigurationPlatforms) = postSolution
67-
{3C2F563D-8CDE-427C-B5C6-83B2C6094942}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
68-
{3C2F563D-8CDE-427C-B5C6-83B2C6094942}.Debug|Any CPU.Build.0 = Debug|Any CPU
69-
{3C2F563D-8CDE-427C-B5C6-83B2C6094942}.Release|Any CPU.ActiveCfg = Release|Any CPU
70-
{3C2F563D-8CDE-427C-B5C6-83B2C6094942}.Release|Any CPU.Build.0 = Release|Any CPU
71-
{677DD50B-705B-41EA-9184-BAF6FD3B51AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
72-
{677DD50B-705B-41EA-9184-BAF6FD3B51AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
73-
{677DD50B-705B-41EA-9184-BAF6FD3B51AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
74-
{677DD50B-705B-41EA-9184-BAF6FD3B51AA}.Release|Any CPU.Build.0 = Release|Any CPU
75-
{050DA337-782A-4CA2-9C6C-35DA30B166FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
76-
{050DA337-782A-4CA2-9C6C-35DA30B166FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
77-
{050DA337-782A-4CA2-9C6C-35DA30B166FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
78-
{050DA337-782A-4CA2-9C6C-35DA30B166FD}.Release|Any CPU.Build.0 = Release|Any CPU
79-
{87832A02-4849-4969-BCF5-04A1176DBFBD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
80-
{87832A02-4849-4969-BCF5-04A1176DBFBD}.Debug|Any CPU.Build.0 = Debug|Any CPU
81-
{87832A02-4849-4969-BCF5-04A1176DBFBD}.Release|Any CPU.ActiveCfg = Release|Any CPU
82-
{87832A02-4849-4969-BCF5-04A1176DBFBD}.Release|Any CPU.Build.0 = Release|Any CPU
83-
{AA5F5F27-00B4-4C49-A757-2EF75BD7339E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
84-
{AA5F5F27-00B4-4C49-A757-2EF75BD7339E}.Debug|Any CPU.Build.0 = Debug|Any CPU
85-
{AA5F5F27-00B4-4C49-A757-2EF75BD7339E}.Release|Any CPU.ActiveCfg = Release|Any CPU
86-
{AA5F5F27-00B4-4C49-A757-2EF75BD7339E}.Release|Any CPU.Build.0 = Release|Any CPU
87-
EndGlobalSection
88-
GlobalSection(NestedProjects) = preSolution
89-
{050DA337-782A-4CA2-9C6C-35DA30B166FD} = {C765FCF7-579D-4518-9027-228A36B5873F}
90-
{AA5F5F27-00B4-4C49-A757-2EF75BD7339E} = {C765FCF7-579D-4518-9027-228A36B5873F}
23+
{C3C92596-1DE5-4DD6-B72F-9419CFFC5442}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
24+
{C3C92596-1DE5-4DD6-B72F-9419CFFC5442}.Debug|Any CPU.Build.0 = Debug|Any CPU
25+
{C3C92596-1DE5-4DD6-B72F-9419CFFC5442}.Release|Any CPU.ActiveCfg = Release|Any CPU
26+
{C3C92596-1DE5-4DD6-B72F-9419CFFC5442}.Release|Any CPU.Build.0 = Release|Any CPU
27+
{919B3975-F504-4A5B-9853-EE8CDA834CF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
28+
{919B3975-F504-4A5B-9853-EE8CDA834CF0}.Debug|Any CPU.Build.0 = Debug|Any CPU
29+
{919B3975-F504-4A5B-9853-EE8CDA834CF0}.Release|Any CPU.ActiveCfg = Release|Any CPU
30+
{919B3975-F504-4A5B-9853-EE8CDA834CF0}.Release|Any CPU.Build.0 = Release|Any CPU
31+
{28799552-4E08-4631-B27E-B2B65195CFFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
32+
{28799552-4E08-4631-B27E-B2B65195CFFA}.Debug|Any CPU.Build.0 = Debug|Any CPU
33+
{28799552-4E08-4631-B27E-B2B65195CFFA}.Release|Any CPU.ActiveCfg = Release|Any CPU
34+
{28799552-4E08-4631-B27E-B2B65195CFFA}.Release|Any CPU.Build.0 = Release|Any CPU
35+
{176BF6D5-5C0B-474D-8E7B-E1B798D8BA87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
36+
{176BF6D5-5C0B-474D-8E7B-E1B798D8BA87}.Debug|Any CPU.Build.0 = Debug|Any CPU
37+
{176BF6D5-5C0B-474D-8E7B-E1B798D8BA87}.Release|Any CPU.ActiveCfg = Release|Any CPU
38+
{176BF6D5-5C0B-474D-8E7B-E1B798D8BA87}.Release|Any CPU.Build.0 = Release|Any CPU
9139
EndGlobalSection
9240
EndGlobal
93-
>>>>>>> d8aaf7e (Robu6/libs nuget example (#57))

0 commit comments

Comments
 (0)