Compare commits

..

23 Commits

Author SHA1 Message Date
Matija Koželj
c53cbe0096 Add local nuget push to remaining projects 2023-01-25 13:14:25 +01:00
Matija Koželj
6d6ca3f633 Add local nuget package push to projects
Add where clause rewriter to TSqlLinguist
2023-01-25 12:07:36 +01:00
Matija Koželj
f989b59330 Add nuget local push to additional projects 2023-01-25 10:59:10 +01:00
Matija Koželj
db4fd905a2 Add nuget local repo upload to Connected.Data 2023-01-25 09:37:50 +01:00
Matija Koželj
ed9f31df1f [WIP] Add additional check to entities list 2023-01-24 18:59:03 +01:00
Matija Koželj
018a48dd65 [WIP] Add debug output of entities 2023-01-24 18:51:59 +01:00
Matija Koželj
9381a4e4c6 Add local nuget push to Connected.Interop 2023-01-24 18:33:32 +01:00
Matija Koželj
93b39c97a7 Add nuget local uploads to Connected.Entities 2023-01-24 18:20:13 +01:00
Matija Koželj
379d31dbfd Add package upload to Connected.Caching 2023-01-24 18:07:41 +01:00
Matija Koželj
be2134313a Updated nuget.config to include local source 2023-01-24 18:07:26 +01:00
Matija Koželj
4ba5b64f66 Fix ReturnValueBinder taking existing value from operation instead of entity 2023-01-24 17:53:49 +01:00
Matija Koželj
1195fa1b7e Fix type conversion in ReturnValueBinder 2023-01-24 17:48:13 +01:00
Matija Koželj
5f48a06413 Replace early returns with continues in ReturnValueBinder 2023-01-24 17:41:47 +01:00
Matija Koželj
38d8781734 Remove redundant operation parameter binding 2023-01-24 17:41:30 +01:00
Matija Koželj
ae0131086e Fix ReturnValueBinder iterating through Operation properties instead
of entity properties
2023-01-24 17:36:19 +01:00
Matija Koželj
57a4f2fb05 Rewrite ReturnValueBinder to properly bind return values 2023-01-24 17:30:16 +01:00
Matija Koželj
d92f0a6f82 Fix CommandBuilder not appending output parameters on cached command 2023-01-24 17:13:27 +01:00
Matija Koželj
ccd824dcc3 Fix EntityStorage parameter binding 2023-01-24 16:52:11 +01:00
Matija Koželj
339dc635e5 Add clone method to EntityExtensions 2023-01-24 16:48:25 +01:00
Matija Koželj
9209bada7a Fix cached command builder 2023-01-24 16:28:49 +01:00
Matija Koželj
5b0537a04a Pass base configuration to WebApplication Instance builder 2023-01-20 13:56:03 +01:00
Matija Koželj
8fe51a15d5 Add IConfiguration constructors to Storage and Endpoint configuration 2023-01-20 10:21:46 +01:00
Matija Koželj
d2d1f66cf6 [WIP] Switch configuration service to use standard configuration stores 2023-01-17 15:38:39 +01:00
31 changed files with 279 additions and 175 deletions

View File

@ -10,8 +10,8 @@
</packageRestore> </packageRestore>
<packageSources> <packageSources>
<add key="NuGet official package source" value="https://api.nuget.org/v3/index.json" /> <add key="NuGet official package source" value="https://api.nuget.org/v3/index.json" />
<add key="Local repository" value="%LOCAL_NUGET%" /> <add key="LocalNugetServer" value="%LOCAL_NUGET_SERVER%" />
<add key="Local file repository" value="%LOCAL_NUGET%" />
</packageSources> </packageSources>
<disabledPackageSources /> <disabledPackageSources />
</configuration> </configuration>

View File

@ -59,4 +59,9 @@
<Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).nupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" /> <Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).nupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" />
<Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).snupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" /> <Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).snupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" />
</Target> </Target>
<Target Name="UploadLocalPackages" AfterTargets="CopyPackages" >
<Exec Command="dotnet nuget push -s LocalNugetServer $(OutputPath)..\$(PackageId).$(PackageVersion).nupkg --api-key $([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET_SERVER_TOKEN'))" IgnoreExitCode="true"></Exec>
<Exec Command="dotnet nuget push -s LocalNugetServer $(OutputPath)..\$(PackageId).$(PackageVersion).snupkg --api-key $([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET_SERVER_TOKEN'))" IgnoreExitCode="true"></Exec>
</Target>
</Project> </Project>

View File

@ -58,4 +58,9 @@
<Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).snupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" /> <Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).snupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" />
</Target> </Target>
<Target Name="UploadLocalPackages" AfterTargets="CopyPackages" >
<Exec Command="dotnet nuget push -s LocalNugetServer $(OutputPath)..\$(PackageId).$(PackageVersion).nupkg --api-key $([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET_SERVER_TOKEN'))" IgnoreExitCode="true"></Exec>
<Exec Command="dotnet nuget push -s LocalNugetServer $(OutputPath)..\$(PackageId).$(PackageVersion).snupkg --api-key $([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET_SERVER_TOKEN'))" IgnoreExitCode="true"></Exec>
</Target>
</Project> </Project>

View File

@ -1,14 +1,16 @@
using Connected.Configuration.Authentication; using Connected.Configuration.Authentication;
using Connected.Configuration.Endpoints; using Connected.Configuration.Endpoints;
using Microsoft.Extensions.Configuration;
namespace Connected.Configuration; namespace Connected.Configuration;
internal class ConfigurationService : IConfigurationService internal class ConfigurationService : IConfigurationService
{ {
public ConfigurationService() public ConfigurationService(IConfiguration configuration)
{ {
Endpoint = new EndpointConfiguration(); Endpoint = new EndpointConfiguration(configuration.GetSection("endpoint"));
Storage = new StorageConfiguration();
Storage = new StorageConfiguration(configuration.GetSection("storage"));
} }
public IEndpointConfiguration Endpoint { get; } public IEndpointConfiguration Endpoint { get; }

View File

@ -40,4 +40,9 @@
<Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).nupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" /> <Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).nupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" />
<Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).snupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" /> <Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).snupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" />
</Target> </Target>
<Target Name="UploadLocalPackages" AfterTargets="CopyPackages" >
<Exec Command="dotnet nuget push -s LocalNugetServer $(OutputPath)..\$(PackageId).$(PackageVersion).nupkg --api-key $([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET_SERVER_TOKEN'))" IgnoreExitCode="true"></Exec>
<Exec Command="dotnet nuget push -s LocalNugetServer $(OutputPath)..\$(PackageId).$(PackageVersion).snupkg --api-key $([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET_SERVER_TOKEN'))" IgnoreExitCode="true"></Exec>
</Target>
</Project> </Project>

View File

@ -1,19 +1,18 @@
using System.Collections.Immutable; using System.Collections.Immutable;
using Microsoft.Extensions.Configuration;
namespace Connected.Configuration namespace Connected.Configuration
{ {
internal class DatabaseConfiguration : IDatabaseConfiguration internal class DatabaseConfiguration : IDatabaseConfiguration
{ {
private List<string> _shards; private readonly List<string> _shards;
public DatabaseConfiguration() public DatabaseConfiguration(IConfiguration configuration)
{ {
/* DefaultConnectionString = "";
* TODO: read from config
*/
DefaultConnectionString = "server=PIT-ZBOOK\\sqlexpress; database=connected; trusted_connection=true;TrustServerCertificate=True;multiple active result sets=true";
_shards = new(); _shards = new();
configuration.Bind(this);
configuration.Bind("shards", _shards);
} }
public string? DefaultConnectionString { get; init; } public string? DefaultConnectionString { get; init; }

View File

@ -1,7 +1,14 @@
namespace Connected.Configuration.Endpoints using Microsoft.Extensions.Configuration;
namespace Connected.Configuration.Endpoints
{ {
internal sealed class EndpointConfiguration : IEndpointConfiguration internal sealed class EndpointConfiguration : IEndpointConfiguration
{ {
public EndpointConfiguration(IConfiguration configuration)
{
configuration.Bind(this);
}
public string? Address { get; set; } public string? Address { get; set; }
} }
} }

View File

@ -4,7 +4,7 @@ namespace Connected.Configuration
{ {
public interface IDatabaseConfiguration public interface IDatabaseConfiguration
{ {
string DefaultConnectionString { get; } string? DefaultConnectionString { get; }
ImmutableList<string> Shards { get; } ImmutableList<string> Shards { get; }
} }

View File

@ -1,10 +1,12 @@
namespace Connected.Configuration using Microsoft.Extensions.Configuration;
namespace Connected.Configuration
{ {
internal class StorageConfiguration : IStorageConfiguration internal class StorageConfiguration : IStorageConfiguration
{ {
public StorageConfiguration() public StorageConfiguration(IConfiguration configuration)
{ {
Databases = new DatabaseConfiguration(); Databases = new DatabaseConfiguration(configuration.GetSection("databases"));
} }
public IDatabaseConfiguration Databases { get; } public IDatabaseConfiguration Databases { get; }

View File

@ -62,4 +62,9 @@
<Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).nupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" /> <Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).nupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" />
<Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).snupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" /> <Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).snupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" />
</Target> </Target>
<Target Name="UploadLocalPackages" AfterTargets="CopyPackages" >
<Exec Command="dotnet nuget push -s LocalNugetServer $(OutputPath)..\$(PackageId).$(PackageVersion).nupkg --api-key $([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET_SERVER_TOKEN'))" IgnoreExitCode="true"></Exec>
<Exec Command="dotnet nuget push -s LocalNugetServer $(OutputPath)..\$(PackageId).$(PackageVersion).snupkg --api-key $([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET_SERVER_TOKEN'))" IgnoreExitCode="true"></Exec>
</Target>
</Project> </Project>

View File

@ -152,7 +152,11 @@ internal class EntityStorage<TEntity> : IAsyncEnumerable<TEntity>, IStorage<TEnt
await Execute(new StorageContextArgs(operation)); await Execute(new StorageContextArgs(operation));
return entity; var clone = entity.Clone();
ReturnValueBinder.Bind(operation, clone);
return clone;
} }
/// <summary> /// <summary>
/// Performs the update on the specified entity with optional concurrency callback support. /// Performs the update on the specified entity with optional concurrency callback support.
@ -271,10 +275,6 @@ internal class EntityStorage<TEntity> : IAsyncEnumerable<TEntity>, IStorage<TEnt
*/ */
if (recordsAffected == 0 && args.Operation.Concurrency == DataConcurrencyMode.Enabled) if (recordsAffected == 0 && args.Operation.Concurrency == DataConcurrencyMode.Enabled)
throw new DBConcurrencyException($"{SR.ErrDataConcurrency} ({typeof(Entity).Name})"); throw new DBConcurrencyException($"{SR.ErrDataConcurrency} ({typeof(Entity).Name})");
/*
* Bind storage parameters with operation parameters.
*/
ReturnValueBinder.Bind(writer, args.Operation);
return recordsAffected; return recordsAffected;
} }

View File

@ -8,38 +8,28 @@ namespace Connected.Data.Storage
{ {
internal static class ReturnValueBinder internal static class ReturnValueBinder
{ {
public static void Bind(IStorageWriter w, IStorageOperation operation) public static void Bind(IStorageOperation operation, object entity)
{ {
List<PropertyInfo> properties = null; if (operation is null || operation.Parameters is null)
if (w.Operation.Parameters is null)
return; return;
foreach (var parameter in w.Operation.Parameters) foreach (var parameter in operation.Parameters)
{ {
if (parameter.Direction != ParameterDirection.ReturnValue && parameter.Direction != ParameterDirection.Output)
continue;
if (parameter.Value == DBNull.Value) if (parameter.Value == DBNull.Value)
continue; continue;
if (properties is null) var properties = new List<PropertyInfo>();
{
properties = new List<PropertyInfo>();
var all = operation.GetType().GetProperties(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance); var all = entity.GetType().GetProperties(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
foreach (var prop in all) foreach (var prop in all)
{ {
if (prop.FindAttribute<ReturnValueAttribute>() is not null) if (prop.FindAttribute<ReturnValueAttribute>() is not null)
properties.Add(prop); properties.Add(prop);
} }
}
PropertyInfo property = null; PropertyInfo? property = null;
if (property is null)
{
foreach (var prop in properties) foreach (var prop in properties)
{ {
if (string.Equals(prop.Name, parameter.Name, StringComparison.Ordinal)) if (string.Equals(prop.Name, parameter.Name, StringComparison.Ordinal))
@ -48,7 +38,6 @@ namespace Connected.Data.Storage
break; break;
} }
} }
}
if (property is null) if (property is null)
{ {
@ -85,26 +74,28 @@ namespace Connected.Data.Storage
} }
} }
if (property is not null) if (property is null)
{ continue;
var existingValue = property.GetValue(operation);
var existingValue = property.GetValue(entity);
var overwriteAtt = property.FindAttribute<ReturnValueAttribute>(); var overwriteAtt = property.FindAttribute<ReturnValueAttribute>();
if (overwriteAtt is null)
continue;
switch (overwriteAtt.ValueBehavior) switch (overwriteAtt.ValueBehavior)
{ {
case PropertyValueBehavior.OverwriteDefault: case PropertyValueBehavior.OverwriteDefault:
var defaultValue = property.PropertyType.GetDefault(); var defaultValue = property.PropertyType.GetDefault();
if (Equals(existingValue, defaultValue)) if (Equals(existingValue, defaultValue))
property.SetValue(operation, parameter.Value); property.SetValue(entity, TypeConversion.Convert(parameter.Value, property.PropertyType));
break; break;
case PropertyValueBehavior.AlwaysOverwrite: case PropertyValueBehavior.AlwaysOverwrite:
property.SetValue(operation, parameter.Value); property.SetValue(entity, TypeConversion.Convert(parameter.Value, property.PropertyType));
break; break;
} }
} }
} }
} }
}
} }

View File

@ -28,6 +28,8 @@ internal abstract class CommandBuilder
if (TryGetExisting(out StorageOperation? existing)) if (TryGetExisting(out StorageOperation? existing))
{ {
if (existing is null)
return null;
/* /*
* We need to rebuild an instance since StorageOperation * We need to rebuild an instance since StorageOperation
* is immutable * is immutable
@ -43,22 +45,23 @@ internal abstract class CommandBuilder
if (result.Parameters is null) if (result.Parameters is null)
return result; return result;
foreach (var parameter in result.Parameters) foreach (var parameter in existing.Parameters)
{
if (parameter.Direction == ParameterDirection.Input)
{ {
if (ResolveProperty(parameter.Name) is PropertyInfo property) if (ResolveProperty(parameter.Name) is PropertyInfo property)
{ {
result.AddParameter(new StorageParameter result.AddParameter(new StorageParameter
{ {
Value = GetValue(property), Value = parameter.Direction switch
{
ParameterDirection.Input => GetValue(property),
_ => default
},
Name = parameter.Name, Name = parameter.Name,
Type = parameter.Type, Type = parameter.Type,
Direction = parameter.Direction Direction = parameter.Direction
}); });
} }
} }
}
return result; return result;
} }

View File

@ -82,6 +82,10 @@ public abstract class EntityCacheClient<TEntity, TPrimaryKey> : StatefulCacheCli
if (context.GetService<IStorageProvider>() is not IStorageProvider provider) if (context.GetService<IStorageProvider>() is not IStorageProvider provider)
return default; return default;
var entities = await provider.Open<TEntity>().AsEntities();
var entity = entities.FirstOrDefault(e => e.Id.Equals(id));
return await (from dc in provider.Open<TEntity>() return await (from dc in provider.Open<TEntity>()
where TypeComparer.Compare(dc.Id, id) where TypeComparer.Compare(dc.Id, id)
select dc).AsEntity(); select dc).AsEntity();

View File

@ -56,4 +56,9 @@
<Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).nupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" /> <Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).nupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" />
<Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).snupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" /> <Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).snupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" />
</Target> </Target>
<Target Name="UploadLocalPackages" AfterTargets="CopyPackages" >
<Exec Command="dotnet nuget push -s LocalNugetServer $(OutputPath)..\$(PackageId).$(PackageVersion).nupkg --api-key $([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET_SERVER_TOKEN'))" IgnoreExitCode="true"></Exec>
<Exec Command="dotnet nuget push -s LocalNugetServer $(OutputPath)..\$(PackageId).$(PackageVersion).snupkg --api-key $([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET_SERVER_TOKEN'))" IgnoreExitCode="true"></Exec>
</Target>
</Project> </Project>

View File

@ -85,6 +85,14 @@ public static class EntitiesExtensions
return Serializer.Merge(newEntity, existing, modifier, new StateModifier { State = state }, sources); return Serializer.Merge(newEntity, existing, modifier, new StateModifier { State = state }, sources);
} }
public static TEntity Clone<TEntity>(this TEntity existing)
where TEntity : IEntity
{
var newEntity = Activator.CreateInstance<TEntity>();
return Serializer.Merge(newEntity, existing);
}
public static async Task<ImmutableList<TSource>> AsEntities<TSource>(this IQueryable<TSource> source, CancellationToken cancellationToken = default) public static async Task<ImmutableList<TSource>> AsEntities<TSource>(this IQueryable<TSource> source, CancellationToken cancellationToken = default)
{ {
if (source is null) if (source is null)

View File

@ -42,4 +42,9 @@
<Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).nupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" /> <Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).nupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" />
<Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).snupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" /> <Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).snupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" />
</Target> </Target>
<Target Name="UploadLocalPackages" AfterTargets="CopyPackages" >
<Exec Command="dotnet nuget push -s LocalNugetServer $(OutputPath)..\$(PackageId).$(PackageVersion).nupkg --api-key $([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET_SERVER_TOKEN'))" IgnoreExitCode="true"></Exec>
<Exec Command="dotnet nuget push -s LocalNugetServer $(OutputPath)..\$(PackageId).$(PackageVersion).snupkg --api-key $([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET_SERVER_TOKEN'))" IgnoreExitCode="true"></Exec>
</Target>
</Project> </Project>

View File

@ -40,4 +40,8 @@
<Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).nupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" /> <Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).nupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" />
<Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).snupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" /> <Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).snupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" />
</Target> </Target>
<Target Name="UploadLocalPackages" AfterTargets="CopyPackages" >
<Exec Command="dotnet nuget push -s LocalNugetServer $(OutputPath)..\$(PackageId).$(PackageVersion).nupkg --api-key $([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET_SERVER_TOKEN'))" IgnoreExitCode="true"></Exec>
<Exec Command="dotnet nuget push -s LocalNugetServer $(OutputPath)..\$(PackageId).$(PackageVersion).snupkg --api-key $([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET_SERVER_TOKEN'))" IgnoreExitCode="true"></Exec>
</Target>
</Project> </Project>

View File

@ -56,4 +56,8 @@
<Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).nupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" /> <Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).nupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" />
<Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).snupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" /> <Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).snupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" />
</Target> </Target>
<Target Name="UploadLocalPackages" AfterTargets="CopyPackages" >
<Exec Command="dotnet nuget push -s LocalNugetServer $(OutputPath)..\$(PackageId).$(PackageVersion).nupkg --api-key $([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET_SERVER_TOKEN'))" IgnoreExitCode="true"></Exec>
<Exec Command="dotnet nuget push -s LocalNugetServer $(OutputPath)..\$(PackageId).$(PackageVersion).snupkg --api-key $([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET_SERVER_TOKEN'))" IgnoreExitCode="true"></Exec>
</Target>
</Project> </Project>

View File

@ -71,4 +71,8 @@
<Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).nupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" /> <Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).nupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" />
<Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).snupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" /> <Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).snupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" />
</Target> </Target>
<Target Name="UploadLocalPackages" AfterTargets="CopyPackages" >
<Exec Command="dotnet nuget push -s LocalNugetServer $(OutputPath)..\$(PackageId).$(PackageVersion).nupkg --api-key $([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET_SERVER_TOKEN'))" IgnoreExitCode="true"></Exec>
<Exec Command="dotnet nuget push -s LocalNugetServer $(OutputPath)..\$(PackageId).$(PackageVersion).snupkg --api-key $([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET_SERVER_TOKEN'))" IgnoreExitCode="true"></Exec>
</Target>
</Project> </Project>

View File

@ -13,7 +13,10 @@ namespace Connected.Instance
var options = new WebApplicationOptions(); var options = new WebApplicationOptions();
config.Bind(options); config.Bind(options);
var builder = WebApplication.CreateBuilder(options); var builder = WebApplication
.CreateBuilder(options);
builder.Configuration.AddConfiguration(config);
var startups = Assemblies.QueryImplementations<IStartup>(); var startups = Assemblies.QueryImplementations<IStartup>();

View File

@ -55,4 +55,13 @@
<Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).nupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" /> <Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).nupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" />
<Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).snupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" /> <Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).snupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" />
</Target> </Target>
<Target Name="UploadLocalPackages" AfterTargets="CopyPackages" >
<Exec Command="dotnet nuget push -s LocalNugetServer $(OutputPath)..\$(PackageId).$(PackageVersion).nupkg --api-key $([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET_SERVER_TOKEN'))" IgnoreExitCode="true"></Exec>
<Exec Command="dotnet nuget push -s LocalNugetServer $(OutputPath)..\$(PackageId).$(PackageVersion).snupkg --api-key $([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET_SERVER_TOKEN'))" IgnoreExitCode="true"></Exec>
</Target>
<Target Name="UploadLocalPackages" AfterTargets="CopyPackages" >
<Exec Command="dotnet nuget push -s LocalNugetServer $(OutputPath)..\$(PackageId).$(PackageVersion).nupkg --api-key $([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET_SERVER_TOKEN'))" IgnoreExitCode="true"></Exec>
<Exec Command="dotnet nuget push -s LocalNugetServer $(OutputPath)..\$(PackageId).$(PackageVersion).snupkg --api-key $([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET_SERVER_TOKEN'))" IgnoreExitCode="true"></Exec>
</Target>
</Project> </Project>

View File

@ -41,4 +41,8 @@
<Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).nupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" /> <Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).nupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" />
<Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).snupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" /> <Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).snupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" />
</Target> </Target>
<Target Name="UploadLocalPackages" AfterTargets="CopyPackages" >
<Exec Command="dotnet nuget push -s LocalNugetServer $(OutputPath)..\$(PackageId).$(PackageVersion).nupkg --api-key $([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET_SERVER_TOKEN'))" IgnoreExitCode="true"></Exec>
<Exec Command="dotnet nuget push -s LocalNugetServer $(OutputPath)..\$(PackageId).$(PackageVersion).snupkg --api-key $([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET_SERVER_TOKEN'))" IgnoreExitCode="true"></Exec>
</Target>
</Project> </Project>

View File

@ -61,4 +61,8 @@
<Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).nupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" /> <Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).nupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" />
<Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).snupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" /> <Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).snupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" />
</Target> </Target>
<Target Name="UploadLocalPackages" AfterTargets="CopyPackages" >
<Exec Command="dotnet nuget push -s LocalNugetServer $(OutputPath)..\$(PackageId).$(PackageVersion).nupkg --api-key $([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET_SERVER_TOKEN'))" IgnoreExitCode="true"></Exec>
<Exec Command="dotnet nuget push -s LocalNugetServer $(OutputPath)..\$(PackageId).$(PackageVersion).snupkg --api-key $([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET_SERVER_TOKEN'))" IgnoreExitCode="true"></Exec>
</Target>
</Project> </Project>

View File

@ -41,5 +41,8 @@
<Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).nupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" /> <Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).nupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" />
<Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).snupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" /> <Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).snupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" />
</Target> </Target>
<Target Name="UploadLocalPackages" AfterTargets="CopyPackages" >
<Exec Command="dotnet nuget push -s LocalNugetServer $(OutputPath)..\$(PackageId).$(PackageVersion).nupkg --api-key $([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET_SERVER_TOKEN'))" IgnoreExitCode="true"></Exec>
<Exec Command="dotnet nuget push -s LocalNugetServer $(OutputPath)..\$(PackageId).$(PackageVersion).snupkg --api-key $([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET_SERVER_TOKEN'))" IgnoreExitCode="true"></Exec>
</Target>
</Project> </Project>

View File

@ -61,4 +61,8 @@
<Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).nupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" /> <Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).nupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" />
<Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).snupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" /> <Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).snupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" />
</Target> </Target>
<Target Name="UploadLocalPackages" AfterTargets="CopyPackages" >
<Exec Command="dotnet nuget push -s LocalNugetServer $(OutputPath)..\$(PackageId).$(PackageVersion).nupkg --api-key $([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET_SERVER_TOKEN'))" IgnoreExitCode="true"></Exec>
<Exec Command="dotnet nuget push -s LocalNugetServer $(OutputPath)..\$(PackageId).$(PackageVersion).snupkg --api-key $([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET_SERVER_TOKEN'))" IgnoreExitCode="true"></Exec>
</Target>
</Project> </Project>

View File

@ -43,4 +43,8 @@
<Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).nupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" /> <Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).nupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" />
<Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).snupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" /> <Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).snupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" />
</Target> </Target>
<Target Name="UploadLocalPackages" AfterTargets="CopyPackages" >
<Exec Command="dotnet nuget push -s LocalNugetServer $(OutputPath)..\$(PackageId).$(PackageVersion).nupkg --api-key $([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET_SERVER_TOKEN'))" IgnoreExitCode="true"></Exec>
<Exec Command="dotnet nuget push -s LocalNugetServer $(OutputPath)..\$(PackageId).$(PackageVersion).snupkg --api-key $([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET_SERVER_TOKEN'))" IgnoreExitCode="true"></Exec>
</Target>
</Project> </Project>

View File

@ -58,5 +58,8 @@
<Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).nupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" /> <Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).nupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" />
<Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).snupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" /> <Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).snupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" />
</Target> </Target>
<Target Name="UploadLocalPackages" AfterTargets="CopyPackages" >
<Exec Command="dotnet nuget push -s LocalNugetServer $(OutputPath)..\$(PackageId).$(PackageVersion).nupkg --api-key $([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET_SERVER_TOKEN'))" IgnoreExitCode="true"></Exec>
<Exec Command="dotnet nuget push -s LocalNugetServer $(OutputPath)..\$(PackageId).$(PackageVersion).snupkg --api-key $([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET_SERVER_TOKEN'))" IgnoreExitCode="true"></Exec>
</Target>
</Project> </Project>

View File

@ -61,4 +61,8 @@
<Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).nupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" /> <Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).nupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" />
<Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).snupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" /> <Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).snupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" />
</Target> </Target>
<Target Name="UploadLocalPackages" AfterTargets="CopyPackages" >
<Exec Command="dotnet nuget push -s LocalNugetServer $(OutputPath)..\$(PackageId).$(PackageVersion).nupkg --api-key $([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET_SERVER_TOKEN'))" IgnoreExitCode="true"></Exec>
<Exec Command="dotnet nuget push -s LocalNugetServer $(OutputPath)..\$(PackageId).$(PackageVersion).snupkg --api-key $([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET_SERVER_TOKEN'))" IgnoreExitCode="true"></Exec>
</Target>
</Project> </Project>

View File

@ -55,4 +55,8 @@
<Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).nupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" /> <Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).nupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" />
<Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).snupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" /> <Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).snupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" />
</Target> </Target>
<Target Name="UploadLocalPackages" AfterTargets="CopyPackages" >
<Exec Command="dotnet nuget push -s LocalNugetServer $(OutputPath)..\$(PackageId).$(PackageVersion).nupkg --api-key $([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET_SERVER_TOKEN'))" IgnoreExitCode="true"></Exec>
<Exec Command="dotnet nuget push -s LocalNugetServer $(OutputPath)..\$(PackageId).$(PackageVersion).snupkg --api-key $([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET_SERVER_TOKEN'))" IgnoreExitCode="true"></Exec>
</Target>
</Project> </Project>

View File

@ -56,4 +56,8 @@
<Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).nupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" /> <Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).nupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" />
<Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).snupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" /> <Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).snupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" />
</Target> </Target>
<Target Name="UploadLocalPackages" AfterTargets="CopyPackages" >
<Exec Command="dotnet nuget push -s LocalNugetServer $(OutputPath)..\$(PackageId).$(PackageVersion).nupkg --api-key $([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET_SERVER_TOKEN'))" IgnoreExitCode="true"></Exec>
<Exec Command="dotnet nuget push -s LocalNugetServer $(OutputPath)..\$(PackageId).$(PackageVersion).snupkg --api-key $([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET_SERVER_TOKEN'))" IgnoreExitCode="true"></Exec>
</Target>
</Project> </Project>