fix: report correct version number

MunicipalityRegistry.sln

@@ -1,6 +1,7 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27130.2036
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29123.88
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C2F8FF63-7A48-4179-A720-86206C42F496}"
 EndProject
@@ -27,6 +28,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		paket.dependencies = paket.dependencies
 		README.md = README.md
 		SEMVER.md = SEMVER.md
+		SolutionInfo.cs = SolutionInfo.cs
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MunicipalityRegistry.Projections.Legacy", "src\MunicipalityRegistry.Projections.Legacy\MunicipalityRegistry.Projections.Legacy.csproj", "{74376690-FB03-4DBA-811B-DD913570C65F}"

SolutionInfo.cs

@@ -0,0 +1,19 @@
+// <auto-generated/>
+using System.Reflection;
+
+[assembly: AssemblyVersionAttribute("2.0.0.0")]
+[assembly: AssemblyFileVersionAttribute("2.0.0.0")]
+[assembly: AssemblyInformationalVersionAttribute("")]
+[assembly: AssemblyProductAttribute("Basisregisters Vlaanderen")]
+[assembly: AssemblyCopyrightAttribute("Copyright (c) Vlaamse overheid")]
+[assembly: AssemblyCompanyAttribute("Vlaamse overheid")]
+namespace System {
+    internal static class AssemblyVersionInformation {
+        internal const System.String AssemblyVersion = "2.0.0.0";
+        internal const System.String AssemblyFileVersion = "2.0.0.0";
+        internal const System.String AssemblyInformationalVersion = "";
+        internal const System.String AssemblyProduct = "Basisregisters Vlaanderen";
+        internal const System.String AssemblyCopyright = "Copyright (c) Vlaamse overheid";
+        internal const System.String AssemblyCompany = "Vlaamse overheid";
+    }
+}

build.fsx

@@ -45,11 +45,16 @@ open ``Build-generic``
 // Push
 // Executes `docker push` to push the built images to the registry.
 
+let product = "Basisregisters Vlaanderen"
+let copyright = "Copyright (c) Vlaamse overheid"
+let company = "Vlaamse overheid"
+
 let dockerRepository = "municipalityregistry"
 let assemblyVersionNumber = (sprintf "2.%s")
 let nugetVersionNumber = (sprintf "%s")
 
 let build = buildSolution assemblyVersionNumber
+let setVersions = (setSolutionVersions assemblyVersionNumber product copyright company)
 let test = testSolution
 let publish = publish assemblyVersionNumber
 let pack = pack nugetVersionNumber
@@ -60,7 +65,10 @@ let push = push dockerRepository
 
 Target "Restore_Solution" (fun _ -> restore "MunicipalityRegistry")
 
-Target "Build_Solution" (fun _ -> build "MunicipalityRegistry")
+Target "Build_Solution" (fun _ ->
+  setVersions "SolutionInfo.cs"
+  build "MunicipalityRegistry"
+)
 
 Target "Test_Solution" (fun _ -> test "MunicipalityRegistry")
 

paket.dependencies

@@ -22,7 +22,7 @@ nuget NetTopologySuite 1.15.3
 nuget Microsoft.EntityFrameworkCore.Design 2.2.6
 
 // BASE REGISTRIES STUFF
-nuget Be.Vlaanderen.Basisregisters.Build.Pipeline ~> 1.7
+nuget Be.Vlaanderen.Basisregisters.Build.Pipeline ~> 1.9
 nuget Be.Vlaanderen.Basisregisters.Testing.Infrastructure.Events ~> 1.1 content: true, copy_content_to_output_dir: always, copy_local: true
 
 nuget Be.Vlaanderen.Basisregisters.AggregateSource ~> 3.2
@@ -32,7 +32,7 @@ nuget Be.Vlaanderen.Basisregisters.AggregateSource.Testing ~> 3.2
 nuget Be.Vlaanderen.Basisregisters.AggregateSource.Testing.SqlStreamStore.Autofac ~> 3.2
 nuget Be.Vlaanderen.Basisregisters.AggregateSource.Testing.Xunit ~> 3.2
 
-nuget Be.Vlaanderen.Basisregisters.Api ~> 7.3
+nuget Be.Vlaanderen.Basisregisters.Api ~> 7.4
 
 nuget Be.Vlaanderen.Basisregisters.CommandHandling ~> 3.2
 nuget Be.Vlaanderen.Basisregisters.CommandHandling.Idempotency ~> 3.2
@@ -84,6 +84,6 @@ nuget AutoFixture.Xunit2 4.11.0
 nuget FluentAssertions 5.9.0
 
 // BUILD STUFF
-nuget FAKE 4.64.13 // Don't update to v5!
+nuget FAKE 4.64.17 // Don't update to v5!
 nuget SourceLink.Embed.AllSourceFiles 2.8.3 copy_local: true
 nuget SourceLink.Copy.PdbFiles 2.8.3 copy_local: true

paket.lock

@@ -55,7 +55,7 @@ NUGET
       Be.Vlaanderen.Basisregisters.AggregateSource.Testing (3.2)
       Microsoft.Extensions.Logging (>= 2.2)
       xunit (>= 2.4.1)
-    Be.Vlaanderen.Basisregisters.Api (7.3.4)
+    Be.Vlaanderen.Basisregisters.Api (7.4)
       Autofac (>= 4.9.4)
       Autofac.Extensions.DependencyInjection (>= 4.4)
       Be.Vlaanderen.Basisregisters.AggregateSource (>= 3.2 < 4.0)
@@ -169,7 +169,7 @@ NUGET
       NSwag.CodeGeneration.CSharp (>= 13.0.5)
       NSwag.CodeGeneration.TypeScript (>= 13.0.5)
       Swashbuckle.AspNetCore (>= 4.0.1)
-    Be.Vlaanderen.Basisregisters.Build.Pipeline (1.7)
+    Be.Vlaanderen.Basisregisters.Build.Pipeline (1.9)
     Be.Vlaanderen.Basisregisters.CommandHandling (3.2)
     Be.Vlaanderen.Basisregisters.CommandHandling.Idempotency (3.2)
       Autofac.Extensions.DependencyInjection (>= 4.4)
@@ -323,7 +323,7 @@ NUGET
       Serilog (>= 2.5)
     DotLiquid (2.0.314)
     EntityFramework (6.2)
-    FAKE (4.64.13)
+    FAKE (4.64.17)
     Fare (2.1.2)
       NETStandard.Library (>= 1.6.1) - restriction: || (&& (== net472) (< net35)) (== netcoreapp2.2) (== netstandard2.0)
     FeatureToggle (4.0.2)

src/MunicipalityRegistry.Api.CrabImport/Infrastructure/EmptyController.cs

@@ -14,6 +14,6 @@ public class EmptyController : ApiController
         public IActionResult Get()
             => Request.Headers[HeaderNames.Accept].ToString().Contains("text/html")
                 ? (IActionResult)new RedirectResult("/docs")
-                : new OkObjectResult($"Welcome to the Basisregisters Vlaanderen Municipality Api v{Assembly.GetEntryAssembly().GetName().Version}.");
+                : new OkObjectResult($"Welcome to the Basisregisters Vlaanderen Municipality CrabImport Api {Assembly.GetEntryAssembly().GetVersionText()}.");
     }
 }

src/MunicipalityRegistry.Api.CrabImport/MunicipalityRegistry.Api.CrabImport.csproj

@@ -27,5 +27,9 @@
     <ProjectReference Include="..\MunicipalityRegistry.Infrastructure\MunicipalityRegistry.Infrastructure.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Include="..\..\SolutionInfo.cs" Link="Properties\SolutionInfo.cs" />
+  </ItemGroup>
+
   <Import Project="..\..\.paket\Paket.Restore.targets" />
 </Project>

src/MunicipalityRegistry.Api.CrabImport/Properties/AssemblyInfo.cs

@@ -1,12 +1,7 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-[assembly: ComVisible(false)]
-[assembly: AssemblyProduct("Basisregisters Vlaanderen")]
-[assembly: AssemblyDescription("MunicipalityRegistry API")]
-[assembly: AssemblyVersion("2.0.0.0")]
-[assembly: AssemblyFileVersion("2.0.0.0")]
-[assembly: AssemblyCopyright("Copyright (c) Vlaamse overheid")]
-[assembly: AssemblyCompany("Vlaamse overheid")]
+[assembly: AssemblyDescription("MunicipalityRegistry CrabImport API")]
 
+[assembly: ComVisible(false)]
 [assembly: Guid("76b208a1-e99b-4b76-b8bf-a2748c91fae5")]

src/MunicipalityRegistry.Api.Extract/Extracts/ExtractController.cs

@@ -19,7 +19,7 @@ namespace MunicipalityRegistry.Api.Extract.Extracts
     [ApiExplorerSettings(GroupName = "Extract")]
     public class ExtractController : ApiController
     {
-        public static string ZipName = "gemeenten";
+        public const string ZipName = "gemeenten";
 
         /// <summary>
         /// Vraag een dump van het volledige register op.

src/MunicipalityRegistry.Api.Extract/Infrastructure/EmptyController.cs

@@ -14,6 +14,6 @@ public class EmptyController : ApiController
         public IActionResult Get()
             => Request.Headers[HeaderNames.Accept].ToString().Contains("text/html")
                 ? (IActionResult)new RedirectResult("/docs")
-                : new OkObjectResult($"Welcome to the Basisregisters Vlaanderen Municipality Api v{Assembly.GetEntryAssembly().GetName().Version}.");
+                : new OkObjectResult($"Welcome to the Basisregisters Vlaanderen Municipality Extract Api {Assembly.GetEntryAssembly().GetVersionText()}.");
     }
 }

src/MunicipalityRegistry.Api.Extract/MunicipalityRegistry.Api.Extract.csproj

@@ -28,5 +28,9 @@
     <ProjectReference Include="..\MunicipalityRegistry.Projections.Extract\MunicipalityRegistry.Projections.Extract.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Include="..\..\SolutionInfo.cs" Link="Properties\SolutionInfo.cs" />
+  </ItemGroup>
+
   <Import Project="..\..\.paket\Paket.Restore.targets" />
 </Project>

src/MunicipalityRegistry.Api.Extract/Properties/AssemblyInfo.cs

@@ -1,13 +1,8 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-[assembly: ComVisible(false)]
-[assembly: AssemblyProduct("Basisregisters Vlaanderen")]
-[assembly: AssemblyDescription("MunicipalityRegistry API")]
-[assembly: AssemblyVersion("2.0.0.0")]
-[assembly: AssemblyFileVersion("2.0.0.0")]
-[assembly: AssemblyCopyright("Copyright (c) Vlaamse overheid")]
-[assembly: AssemblyCompany("Vlaamse overheid")]
+[assembly: AssemblyDescription("MunicipalityRegistry Extract API")]
 
+[assembly: ComVisible(false)]
 [assembly: Guid("835765eb-4bfb-4f8a-a530-5e10969bf455")]
 

src/MunicipalityRegistry.Api.Legacy/Infrastructure/EmptyController.cs

@@ -14,6 +14,6 @@ public class EmptyController : ApiController
         public IActionResult Get()
             => Request.Headers[HeaderNames.Accept].ToString().Contains("text/html")
                 ? (IActionResult)new RedirectResult("/docs")
-                : new OkObjectResult($"Welcome to the Basisregisters Vlaanderen Municipality Api v{Assembly.GetEntryAssembly().GetName().Version}.");
+                : new OkObjectResult($"Welcome to the Basisregisters Vlaanderen Municipality Legacy Api {Assembly.GetEntryAssembly().GetVersionText()}.");
     }
 }

src/MunicipalityRegistry.Api.Legacy/Infrastructure/Modules/ApiModule.cs

@@ -30,7 +30,8 @@ protected override void Load(ContainerBuilder containerBuilder)
                 .RegisterModule(new DataDogModule(_configuration))
                 .RegisterModule(new LegacyModule(_configuration, _services, _loggerFactory));
 
-            containerBuilder.Populate(_services);
+            containerBuilder
+                .Populate(_services);
         }
     }
 }

src/MunicipalityRegistry.Api.Legacy/Municipality/MunicipalityController.cs

@@ -108,7 +108,7 @@ await context
             Taal? taal,
             CancellationToken cancellationToken = default)
         {
-            var filtering = Request.ExtractFilteringRequest<MunicipalityFilter>();
+            var filtering = Request.ExtractFilteringRequest<MunicipalityListFilter>();
             var sorting = Request.ExtractSortingRequest();
             var pagination = Request.ExtractPaginationRequest();
 
@@ -201,12 +201,12 @@ await context
             if (Request.ContentLength.HasValue && Request.ContentLength > 0 && request == null)
                 return Ok(new MunicipalityBosaResponse());
 
-            var filtering = new MunicipalityNameFilter(request);
+            var filtering = new MunicipalityBosaFilter(request);
             var sorting = new SortingHeader(string.Empty, SortOrder.Ascending);
             var pagination = new PaginationRequest(0, 1000);
 
             var filteredMunicipalities = new MunicipalityBosaQuery(context).Fetch(
-                new FilteringHeader<MunicipalityNameFilter>(filtering),
+                new FilteringHeader<MunicipalityBosaFilter>(filtering),
                 sorting,
                 pagination);
 

src/MunicipalityRegistry.Api.Legacy/Municipality/Query/MunicipalityBosaQuery.cs

@@ -16,13 +16,13 @@ namespace MunicipalityRegistry.Api.Legacy.Municipality.Query
 
     public class MunicipalityBosaQueryResult
     {
-        public Guid MunicipalityId { get; set; }
-        public string NisCode { get; set; }
-        public string NameDutch { get; set; }
-        public string NameFrench { get; set; }
-        public string NameGerman { get; set; }
-        public string NameEnglish { get; set; }
-        public DateTimeOffset Version { get; set; }
+        public Guid MunicipalityId { get; }
+        public string NisCode { get; }
+        public string NameDutch { get; }
+        public string NameFrench { get; }
+        public string NameGerman { get; }
+        public string NameEnglish { get;  }
+        public DateTimeOffset Version { get;  }
 
         public MunicipalityBosaQueryResult(
             Guid municipalityId,
@@ -62,11 +62,11 @@ public string GetNameValueByLanguage(Language language)
         }
     }
 
-    public class MunicipalityBosaQuery : Query<MunicipalityName, MunicipalityNameFilter, MunicipalityBosaQueryResult>
+    public class MunicipalityBosaQuery : Query<MunicipalityName, MunicipalityBosaFilter, MunicipalityBosaQueryResult>
     {
         private readonly LegacyContext _context;
 
-        protected override ISorting Sorting => new MunicipalityNameSorting();
+        protected override ISorting Sorting => new MunicipalityBosaSorting();
 
         public MunicipalityBosaQuery(LegacyContext context) => _context = context;
 
@@ -80,7 +80,7 @@ public class MunicipalityBosaQuery : Query<MunicipalityName, MunicipalityNameFil
                 x.NameGerman,
                 x.NameEnglish);
 
-        protected override IQueryable<MunicipalityName> Filter(FilteringHeader<MunicipalityNameFilter> filtering)
+        protected override IQueryable<MunicipalityName> Filter(FilteringHeader<MunicipalityBosaFilter> filtering)
         {
             var municipalities = _context
                 .MunicipalityName
@@ -180,7 +180,7 @@ protected override IQueryable<MunicipalityName> Filter(FilteringHeader<Municipal
         }
     }
 
-    internal class MunicipalityNameSorting : ISorting
+    public class MunicipalityBosaSorting : ISorting
     {
         public IEnumerable<string> SortableFields { get; } = new[]
         {
@@ -191,15 +191,15 @@ internal class MunicipalityNameSorting : ISorting
             new SortingHeader(nameof(MunicipalityName.NisCode), SortOrder.Ascending);
     }
 
-    public class MunicipalityNameFilter
+    public class MunicipalityBosaFilter
     {
-        public string NisCode { get; set; }
-        public DateTimeOffset? Version { get; set; }
-        public string Name { get; set; }
-        public Language? Language { get; set; }
-        public bool IsContainsFilter { get; set; }
+        public string NisCode { get; }
+        public DateTimeOffset? Version { get; }
+        public string Name { get; }
+        public Language? Language { get; }
+        public bool IsContainsFilter { get; }
 
-        public MunicipalityNameFilter(BosaMunicipalityRequest request)
+        public MunicipalityBosaFilter(BosaMunicipalityRequest request)
         {
             NisCode = request?.GemeenteCode?.ObjectId;
             Version = request?.GemeenteCode?.VersieId;

src/MunicipalityRegistry.Api.Legacy/Municipality/Query/MunicipalityListQuery.cs

@@ -9,15 +9,16 @@ namespace MunicipalityRegistry.Api.Legacy.Municipality.Query
     using Projections.Legacy;
     using Projections.Legacy.MunicipalityList;
 
-    public class MunicipalityListQuery : Query<MunicipalityListItem, MunicipalityFilter>
+    public class MunicipalityListQuery :
+        Query<MunicipalityListItem, MunicipalityListFilter, MunicipalityListItem>
     {
         private readonly LegacyContext _context;
 
-        protected override ISorting Sorting => new MunicipalitySorting();
+        protected override ISorting Sorting => new MunicipalityListSorting();
 
         public MunicipalityListQuery(LegacyContext context) => _context = context;
 
-        protected override IQueryable<MunicipalityListItem> Filter(FilteringHeader<MunicipalityFilter> filtering)
+        protected override IQueryable<MunicipalityListItem> Filter(FilteringHeader<MunicipalityListFilter> filtering)
         {
             var municipalities = _context
                 .MunicipalityList
@@ -43,24 +44,24 @@ protected override IQueryable<MunicipalityListItem> Filter(FilteringHeader<Munic
 
             return municipalities;
         }
+    }
 
-        internal class MunicipalitySorting : ISorting
+    public class MunicipalityListSorting : ISorting
+    {
+        public IEnumerable<string> SortableFields { get; } = new[]
         {
-            public IEnumerable<string> SortableFields { get; } = new[]
-            {
-                nameof(MunicipalityListItem.NisCode),
-                nameof(MunicipalityListItem.DefaultName),
-                nameof(MunicipalityListItem.NameDutch),
-                nameof(MunicipalityListItem.NameEnglish),
-                nameof(MunicipalityListItem.NameFrench),
-                nameof(MunicipalityListItem.NameGerman)
-            };
+            nameof(MunicipalityListItem.NisCode),
+            nameof(MunicipalityListItem.DefaultName),
+            nameof(MunicipalityListItem.NameDutch),
+            nameof(MunicipalityListItem.NameEnglish),
+            nameof(MunicipalityListItem.NameFrench),
+            nameof(MunicipalityListItem.NameGerman)
+        };
 
-            public SortingHeader DefaultSortingHeader { get; } = new SortingHeader(nameof(MunicipalityListItem.NisCode), SortOrder.Ascending);
-        }
+        public SortingHeader DefaultSortingHeader { get; } = new SortingHeader(nameof(MunicipalityListItem.NisCode), SortOrder.Ascending);
     }
 
-    public class MunicipalityFilter
+    public class MunicipalityListFilter
     {
         public string NisCode { get; set; }
         public string NameDutch { get; set; }