Compare commits
No commits in common. "79ea6dc46dbacd608bbde582a0c560d2cc8e2154" and "f8b0ca332b602b39ea9a61c92e4c284f747d19a5" have entirely different histories.
79ea6dc46d
...
f8b0ca332b
3
.gitmodules
vendored
3
.gitmodules
vendored
@ -1,3 +0,0 @@
|
||||
[submodule "dependencies/Connected"]
|
||||
path = dependencies/Connected
|
||||
url = https://git.tompit.com/Connected/Connected.git
|
||||
@ -3,6 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio Version 17
|
||||
VisualStudioVersion = 17.4.33015.44
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dependencies", "Dependencies", "{ECD0596E-5A80-48B7-BF0C-1E33EBE9FC79}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Caching", "src\Connected.Caching\Connected.Caching.csproj", "{BF6FFC2B-455F-42E9-AEE5-FFC6AC62FDDD}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Collections", "src\Connected.Collections\Connected.Collections.csproj", "{A590C0CC-B45F-4C6C-A616-E21336E3AD67}"
|
||||
@ -39,18 +41,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Threading", "src\
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Validation", "src\Connected.Validation\Connected.Validation.csproj", "{BAE4A983-1C9E-4ADA-AB0A-C401EBBA6A0C}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected", "..\Connected\src\Connected\Connected.csproj", "{8A18E8FA-3079-4137-BEA2-07DA32D83F80}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Expressions", "src\Connected.Expressions\Connected.Expressions.csproj", "{E597528B-95CA-4ACB-A44B-2C0737084581}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Data.Tests", "src\Connected.Data.Tests\Connected.Data.Tests.csproj", "{C6520F60-774E-41B1-8B17-7EF0B825BF6A}"
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{D6F579A8-2BDD-4E47-BF39-FB8650E5039E}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Expressions.Tests", "src\Connected.Expressions.Tests\Connected.Expressions.Tests.csproj", "{9D4ED240-112A-467D-BCD7-2989DD172B83}"
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dependencies", "Dependencies", "{FC409A4C-5FC3-4597-85BC-21DBB018450D}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected", "dependencies\Connected\src\Connected\Connected.csproj", "{451651E0-F7E2-42C3-B8C8-474D89B220B6}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
@ -129,30 +123,20 @@ Global
|
||||
{BAE4A983-1C9E-4ADA-AB0A-C401EBBA6A0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{BAE4A983-1C9E-4ADA-AB0A-C401EBBA6A0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{BAE4A983-1C9E-4ADA-AB0A-C401EBBA6A0C}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{8A18E8FA-3079-4137-BEA2-07DA32D83F80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{8A18E8FA-3079-4137-BEA2-07DA32D83F80}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{8A18E8FA-3079-4137-BEA2-07DA32D83F80}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{8A18E8FA-3079-4137-BEA2-07DA32D83F80}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{E597528B-95CA-4ACB-A44B-2C0737084581}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{E597528B-95CA-4ACB-A44B-2C0737084581}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{E597528B-95CA-4ACB-A44B-2C0737084581}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{E597528B-95CA-4ACB-A44B-2C0737084581}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{C6520F60-774E-41B1-8B17-7EF0B825BF6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{C6520F60-774E-41B1-8B17-7EF0B825BF6A}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{C6520F60-774E-41B1-8B17-7EF0B825BF6A}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{C6520F60-774E-41B1-8B17-7EF0B825BF6A}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{9D4ED240-112A-467D-BCD7-2989DD172B83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{9D4ED240-112A-467D-BCD7-2989DD172B83}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{9D4ED240-112A-467D-BCD7-2989DD172B83}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{9D4ED240-112A-467D-BCD7-2989DD172B83}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{451651E0-F7E2-42C3-B8C8-474D89B220B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{451651E0-F7E2-42C3-B8C8-474D89B220B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{451651E0-F7E2-42C3-B8C8-474D89B220B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{451651E0-F7E2-42C3-B8C8-474D89B220B6}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
GlobalSection(NestedProjects) = preSolution
|
||||
{C6520F60-774E-41B1-8B17-7EF0B825BF6A} = {D6F579A8-2BDD-4E47-BF39-FB8650E5039E}
|
||||
{9D4ED240-112A-467D-BCD7-2989DD172B83} = {D6F579A8-2BDD-4E47-BF39-FB8650E5039E}
|
||||
{451651E0-F7E2-42C3-B8C8-474D89B220B6} = {FC409A4C-5FC3-4597-85BC-21DBB018450D}
|
||||
{8A18E8FA-3079-4137-BEA2-07DA32D83F80} = {ECD0596E-5A80-48B7-BF0C-1E33EBE9FC79}
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
SolutionGuid = {C63B5A75-C99A-45D7-A691-26E568A51740}
|
||||
|
||||
661
LICENSE
661
LICENSE
@ -1,661 +0,0 @@
|
||||
GNU AFFERO GENERAL PUBLIC LICENSE
|
||||
Version 3, 19 November 2007
|
||||
|
||||
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
Preamble
|
||||
|
||||
The GNU Affero General Public License is a free, copyleft license for
|
||||
software and other kinds of works, specifically designed to ensure
|
||||
cooperation with the community in the case of network server software.
|
||||
|
||||
The licenses for most software and other practical works are designed
|
||||
to take away your freedom to share and change the works. By contrast,
|
||||
our General Public Licenses are intended to guarantee your freedom to
|
||||
share and change all versions of a program--to make sure it remains free
|
||||
software for all its users.
|
||||
|
||||
When we speak of free software, we are referring to freedom, not
|
||||
price. Our General Public Licenses are designed to make sure that you
|
||||
have the freedom to distribute copies of free software (and charge for
|
||||
them if you wish), that you receive source code or can get it if you
|
||||
want it, that you can change the software or use pieces of it in new
|
||||
free programs, and that you know you can do these things.
|
||||
|
||||
Developers that use our General Public Licenses protect your rights
|
||||
with two steps: (1) assert copyright on the software, and (2) offer
|
||||
you this License which gives you legal permission to copy, distribute
|
||||
and/or modify the software.
|
||||
|
||||
A secondary benefit of defending all users' freedom is that
|
||||
improvements made in alternate versions of the program, if they
|
||||
receive widespread use, become available for other developers to
|
||||
incorporate. Many developers of free software are heartened and
|
||||
encouraged by the resulting cooperation. However, in the case of
|
||||
software used on network servers, this result may fail to come about.
|
||||
The GNU General Public License permits making a modified version and
|
||||
letting the public access it on a server without ever releasing its
|
||||
source code to the public.
|
||||
|
||||
The GNU Affero General Public License is designed specifically to
|
||||
ensure that, in such cases, the modified source code becomes available
|
||||
to the community. It requires the operator of a network server to
|
||||
provide the source code of the modified version running there to the
|
||||
users of that server. Therefore, public use of a modified version, on
|
||||
a publicly accessible server, gives the public access to the source
|
||||
code of the modified version.
|
||||
|
||||
An older license, called the Affero General Public License and
|
||||
published by Affero, was designed to accomplish similar goals. This is
|
||||
a different license, not a version of the Affero GPL, but Affero has
|
||||
released a new version of the Affero GPL which permits relicensing under
|
||||
this license.
|
||||
|
||||
The precise terms and conditions for copying, distribution and
|
||||
modification follow.
|
||||
|
||||
TERMS AND CONDITIONS
|
||||
|
||||
0. Definitions.
|
||||
|
||||
"This License" refers to version 3 of the GNU Affero General Public License.
|
||||
|
||||
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||
works, such as semiconductor masks.
|
||||
|
||||
"The Program" refers to any copyrightable work licensed under this
|
||||
License. Each licensee is addressed as "you". "Licensees" and
|
||||
"recipients" may be individuals or organizations.
|
||||
|
||||
To "modify" a work means to copy from or adapt all or part of the work
|
||||
in a fashion requiring copyright permission, other than the making of an
|
||||
exact copy. The resulting work is called a "modified version" of the
|
||||
earlier work or a work "based on" the earlier work.
|
||||
|
||||
A "covered work" means either the unmodified Program or a work based
|
||||
on the Program.
|
||||
|
||||
To "propagate" a work means to do anything with it that, without
|
||||
permission, would make you directly or secondarily liable for
|
||||
infringement under applicable copyright law, except executing it on a
|
||||
computer or modifying a private copy. Propagation includes copying,
|
||||
distribution (with or without modification), making available to the
|
||||
public, and in some countries other activities as well.
|
||||
|
||||
To "convey" a work means any kind of propagation that enables other
|
||||
parties to make or receive copies. Mere interaction with a user through
|
||||
a computer network, with no transfer of a copy, is not conveying.
|
||||
|
||||
An interactive user interface displays "Appropriate Legal Notices"
|
||||
to the extent that it includes a convenient and prominently visible
|
||||
feature that (1) displays an appropriate copyright notice, and (2)
|
||||
tells the user that there is no warranty for the work (except to the
|
||||
extent that warranties are provided), that licensees may convey the
|
||||
work under this License, and how to view a copy of this License. If
|
||||
the interface presents a list of user commands or options, such as a
|
||||
menu, a prominent item in the list meets this criterion.
|
||||
|
||||
1. Source Code.
|
||||
|
||||
The "source code" for a work means the preferred form of the work
|
||||
for making modifications to it. "Object code" means any non-source
|
||||
form of a work.
|
||||
|
||||
A "Standard Interface" means an interface that either is an official
|
||||
standard defined by a recognized standards body, or, in the case of
|
||||
interfaces specified for a particular programming language, one that
|
||||
is widely used among developers working in that language.
|
||||
|
||||
The "System Libraries" of an executable work include anything, other
|
||||
than the work as a whole, that (a) is included in the normal form of
|
||||
packaging a Major Component, but which is not part of that Major
|
||||
Component, and (b) serves only to enable use of the work with that
|
||||
Major Component, or to implement a Standard Interface for which an
|
||||
implementation is available to the public in source code form. A
|
||||
"Major Component", in this context, means a major essential component
|
||||
(kernel, window system, and so on) of the specific operating system
|
||||
(if any) on which the executable work runs, or a compiler used to
|
||||
produce the work, or an object code interpreter used to run it.
|
||||
|
||||
The "Corresponding Source" for a work in object code form means all
|
||||
the source code needed to generate, install, and (for an executable
|
||||
work) run the object code and to modify the work, including scripts to
|
||||
control those activities. However, it does not include the work's
|
||||
System Libraries, or general-purpose tools or generally available free
|
||||
programs which are used unmodified in performing those activities but
|
||||
which are not part of the work. For example, Corresponding Source
|
||||
includes interface definition files associated with source files for
|
||||
the work, and the source code for shared libraries and dynamically
|
||||
linked subprograms that the work is specifically designed to require,
|
||||
such as by intimate data communication or control flow between those
|
||||
subprograms and other parts of the work.
|
||||
|
||||
The Corresponding Source need not include anything that users
|
||||
can regenerate automatically from other parts of the Corresponding
|
||||
Source.
|
||||
|
||||
The Corresponding Source for a work in source code form is that
|
||||
same work.
|
||||
|
||||
2. Basic Permissions.
|
||||
|
||||
All rights granted under this License are granted for the term of
|
||||
copyright on the Program, and are irrevocable provided the stated
|
||||
conditions are met. This License explicitly affirms your unlimited
|
||||
permission to run the unmodified Program. The output from running a
|
||||
covered work is covered by this License only if the output, given its
|
||||
content, constitutes a covered work. This License acknowledges your
|
||||
rights of fair use or other equivalent, as provided by copyright law.
|
||||
|
||||
You may make, run and propagate covered works that you do not
|
||||
convey, without conditions so long as your license otherwise remains
|
||||
in force. You may convey covered works to others for the sole purpose
|
||||
of having them make modifications exclusively for you, or provide you
|
||||
with facilities for running those works, provided that you comply with
|
||||
the terms of this License in conveying all material for which you do
|
||||
not control copyright. Those thus making or running the covered works
|
||||
for you must do so exclusively on your behalf, under your direction
|
||||
and control, on terms that prohibit them from making any copies of
|
||||
your copyrighted material outside their relationship with you.
|
||||
|
||||
Conveying under any other circumstances is permitted solely under
|
||||
the conditions stated below. Sublicensing is not allowed; section 10
|
||||
makes it unnecessary.
|
||||
|
||||
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||
|
||||
No covered work shall be deemed part of an effective technological
|
||||
measure under any applicable law fulfilling obligations under article
|
||||
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||
similar laws prohibiting or restricting circumvention of such
|
||||
measures.
|
||||
|
||||
When you convey a covered work, you waive any legal power to forbid
|
||||
circumvention of technological measures to the extent such circumvention
|
||||
is effected by exercising rights under this License with respect to
|
||||
the covered work, and you disclaim any intention to limit operation or
|
||||
modification of the work as a means of enforcing, against the work's
|
||||
users, your or third parties' legal rights to forbid circumvention of
|
||||
technological measures.
|
||||
|
||||
4. Conveying Verbatim Copies.
|
||||
|
||||
You may convey verbatim copies of the Program's source code as you
|
||||
receive it, in any medium, provided that you conspicuously and
|
||||
appropriately publish on each copy an appropriate copyright notice;
|
||||
keep intact all notices stating that this License and any
|
||||
non-permissive terms added in accord with section 7 apply to the code;
|
||||
keep intact all notices of the absence of any warranty; and give all
|
||||
recipients a copy of this License along with the Program.
|
||||
|
||||
You may charge any price or no price for each copy that you convey,
|
||||
and you may offer support or warranty protection for a fee.
|
||||
|
||||
5. Conveying Modified Source Versions.
|
||||
|
||||
You may convey a work based on the Program, or the modifications to
|
||||
produce it from the Program, in the form of source code under the
|
||||
terms of section 4, provided that you also meet all of these conditions:
|
||||
|
||||
a) The work must carry prominent notices stating that you modified
|
||||
it, and giving a relevant date.
|
||||
|
||||
b) The work must carry prominent notices stating that it is
|
||||
released under this License and any conditions added under section
|
||||
7. This requirement modifies the requirement in section 4 to
|
||||
"keep intact all notices".
|
||||
|
||||
c) You must license the entire work, as a whole, under this
|
||||
License to anyone who comes into possession of a copy. This
|
||||
License will therefore apply, along with any applicable section 7
|
||||
additional terms, to the whole of the work, and all its parts,
|
||||
regardless of how they are packaged. This License gives no
|
||||
permission to license the work in any other way, but it does not
|
||||
invalidate such permission if you have separately received it.
|
||||
|
||||
d) If the work has interactive user interfaces, each must display
|
||||
Appropriate Legal Notices; however, if the Program has interactive
|
||||
interfaces that do not display Appropriate Legal Notices, your
|
||||
work need not make them do so.
|
||||
|
||||
A compilation of a covered work with other separate and independent
|
||||
works, which are not by their nature extensions of the covered work,
|
||||
and which are not combined with it such as to form a larger program,
|
||||
in or on a volume of a storage or distribution medium, is called an
|
||||
"aggregate" if the compilation and its resulting copyright are not
|
||||
used to limit the access or legal rights of the compilation's users
|
||||
beyond what the individual works permit. Inclusion of a covered work
|
||||
in an aggregate does not cause this License to apply to the other
|
||||
parts of the aggregate.
|
||||
|
||||
6. Conveying Non-Source Forms.
|
||||
|
||||
You may convey a covered work in object code form under the terms
|
||||
of sections 4 and 5, provided that you also convey the
|
||||
machine-readable Corresponding Source under the terms of this License,
|
||||
in one of these ways:
|
||||
|
||||
a) Convey the object code in, or embodied in, a physical product
|
||||
(including a physical distribution medium), accompanied by the
|
||||
Corresponding Source fixed on a durable physical medium
|
||||
customarily used for software interchange.
|
||||
|
||||
b) Convey the object code in, or embodied in, a physical product
|
||||
(including a physical distribution medium), accompanied by a
|
||||
written offer, valid for at least three years and valid for as
|
||||
long as you offer spare parts or customer support for that product
|
||||
model, to give anyone who possesses the object code either (1) a
|
||||
copy of the Corresponding Source for all the software in the
|
||||
product that is covered by this License, on a durable physical
|
||||
medium customarily used for software interchange, for a price no
|
||||
more than your reasonable cost of physically performing this
|
||||
conveying of source, or (2) access to copy the
|
||||
Corresponding Source from a network server at no charge.
|
||||
|
||||
c) Convey individual copies of the object code with a copy of the
|
||||
written offer to provide the Corresponding Source. This
|
||||
alternative is allowed only occasionally and noncommercially, and
|
||||
only if you received the object code with such an offer, in accord
|
||||
with subsection 6b.
|
||||
|
||||
d) Convey the object code by offering access from a designated
|
||||
place (gratis or for a charge), and offer equivalent access to the
|
||||
Corresponding Source in the same way through the same place at no
|
||||
further charge. You need not require recipients to copy the
|
||||
Corresponding Source along with the object code. If the place to
|
||||
copy the object code is a network server, the Corresponding Source
|
||||
may be on a different server (operated by you or a third party)
|
||||
that supports equivalent copying facilities, provided you maintain
|
||||
clear directions next to the object code saying where to find the
|
||||
Corresponding Source. Regardless of what server hosts the
|
||||
Corresponding Source, you remain obligated to ensure that it is
|
||||
available for as long as needed to satisfy these requirements.
|
||||
|
||||
e) Convey the object code using peer-to-peer transmission, provided
|
||||
you inform other peers where the object code and Corresponding
|
||||
Source of the work are being offered to the general public at no
|
||||
charge under subsection 6d.
|
||||
|
||||
A separable portion of the object code, whose source code is excluded
|
||||
from the Corresponding Source as a System Library, need not be
|
||||
included in conveying the object code work.
|
||||
|
||||
A "User Product" is either (1) a "consumer product", which means any
|
||||
tangible personal property which is normally used for personal, family,
|
||||
or household purposes, or (2) anything designed or sold for incorporation
|
||||
into a dwelling. In determining whether a product is a consumer product,
|
||||
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||
product received by a particular user, "normally used" refers to a
|
||||
typical or common use of that class of product, regardless of the status
|
||||
of the particular user or of the way in which the particular user
|
||||
actually uses, or expects or is expected to use, the product. A product
|
||||
is a consumer product regardless of whether the product has substantial
|
||||
commercial, industrial or non-consumer uses, unless such uses represent
|
||||
the only significant mode of use of the product.
|
||||
|
||||
"Installation Information" for a User Product means any methods,
|
||||
procedures, authorization keys, or other information required to install
|
||||
and execute modified versions of a covered work in that User Product from
|
||||
a modified version of its Corresponding Source. The information must
|
||||
suffice to ensure that the continued functioning of the modified object
|
||||
code is in no case prevented or interfered with solely because
|
||||
modification has been made.
|
||||
|
||||
If you convey an object code work under this section in, or with, or
|
||||
specifically for use in, a User Product, and the conveying occurs as
|
||||
part of a transaction in which the right of possession and use of the
|
||||
User Product is transferred to the recipient in perpetuity or for a
|
||||
fixed term (regardless of how the transaction is characterized), the
|
||||
Corresponding Source conveyed under this section must be accompanied
|
||||
by the Installation Information. But this requirement does not apply
|
||||
if neither you nor any third party retains the ability to install
|
||||
modified object code on the User Product (for example, the work has
|
||||
been installed in ROM).
|
||||
|
||||
The requirement to provide Installation Information does not include a
|
||||
requirement to continue to provide support service, warranty, or updates
|
||||
for a work that has been modified or installed by the recipient, or for
|
||||
the User Product in which it has been modified or installed. Access to a
|
||||
network may be denied when the modification itself materially and
|
||||
adversely affects the operation of the network or violates the rules and
|
||||
protocols for communication across the network.
|
||||
|
||||
Corresponding Source conveyed, and Installation Information provided,
|
||||
in accord with this section must be in a format that is publicly
|
||||
documented (and with an implementation available to the public in
|
||||
source code form), and must require no special password or key for
|
||||
unpacking, reading or copying.
|
||||
|
||||
7. Additional Terms.
|
||||
|
||||
"Additional permissions" are terms that supplement the terms of this
|
||||
License by making exceptions from one or more of its conditions.
|
||||
Additional permissions that are applicable to the entire Program shall
|
||||
be treated as though they were included in this License, to the extent
|
||||
that they are valid under applicable law. If additional permissions
|
||||
apply only to part of the Program, that part may be used separately
|
||||
under those permissions, but the entire Program remains governed by
|
||||
this License without regard to the additional permissions.
|
||||
|
||||
When you convey a copy of a covered work, you may at your option
|
||||
remove any additional permissions from that copy, or from any part of
|
||||
it. (Additional permissions may be written to require their own
|
||||
removal in certain cases when you modify the work.) You may place
|
||||
additional permissions on material, added by you to a covered work,
|
||||
for which you have or can give appropriate copyright permission.
|
||||
|
||||
Notwithstanding any other provision of this License, for material you
|
||||
add to a covered work, you may (if authorized by the copyright holders of
|
||||
that material) supplement the terms of this License with terms:
|
||||
|
||||
a) Disclaiming warranty or limiting liability differently from the
|
||||
terms of sections 15 and 16 of this License; or
|
||||
|
||||
b) Requiring preservation of specified reasonable legal notices or
|
||||
author attributions in that material or in the Appropriate Legal
|
||||
Notices displayed by works containing it; or
|
||||
|
||||
c) Prohibiting misrepresentation of the origin of that material, or
|
||||
requiring that modified versions of such material be marked in
|
||||
reasonable ways as different from the original version; or
|
||||
|
||||
d) Limiting the use for publicity purposes of names of licensors or
|
||||
authors of the material; or
|
||||
|
||||
e) Declining to grant rights under trademark law for use of some
|
||||
trade names, trademarks, or service marks; or
|
||||
|
||||
f) Requiring indemnification of licensors and authors of that
|
||||
material by anyone who conveys the material (or modified versions of
|
||||
it) with contractual assumptions of liability to the recipient, for
|
||||
any liability that these contractual assumptions directly impose on
|
||||
those licensors and authors.
|
||||
|
||||
All other non-permissive additional terms are considered "further
|
||||
restrictions" within the meaning of section 10. If the Program as you
|
||||
received it, or any part of it, contains a notice stating that it is
|
||||
governed by this License along with a term that is a further
|
||||
restriction, you may remove that term. If a license document contains
|
||||
a further restriction but permits relicensing or conveying under this
|
||||
License, you may add to a covered work material governed by the terms
|
||||
of that license document, provided that the further restriction does
|
||||
not survive such relicensing or conveying.
|
||||
|
||||
If you add terms to a covered work in accord with this section, you
|
||||
must place, in the relevant source files, a statement of the
|
||||
additional terms that apply to those files, or a notice indicating
|
||||
where to find the applicable terms.
|
||||
|
||||
Additional terms, permissive or non-permissive, may be stated in the
|
||||
form of a separately written license, or stated as exceptions;
|
||||
the above requirements apply either way.
|
||||
|
||||
8. Termination.
|
||||
|
||||
You may not propagate or modify a covered work except as expressly
|
||||
provided under this License. Any attempt otherwise to propagate or
|
||||
modify it is void, and will automatically terminate your rights under
|
||||
this License (including any patent licenses granted under the third
|
||||
paragraph of section 11).
|
||||
|
||||
However, if you cease all violation of this License, then your
|
||||
license from a particular copyright holder is reinstated (a)
|
||||
provisionally, unless and until the copyright holder explicitly and
|
||||
finally terminates your license, and (b) permanently, if the copyright
|
||||
holder fails to notify you of the violation by some reasonable means
|
||||
prior to 60 days after the cessation.
|
||||
|
||||
Moreover, your license from a particular copyright holder is
|
||||
reinstated permanently if the copyright holder notifies you of the
|
||||
violation by some reasonable means, this is the first time you have
|
||||
received notice of violation of this License (for any work) from that
|
||||
copyright holder, and you cure the violation prior to 30 days after
|
||||
your receipt of the notice.
|
||||
|
||||
Termination of your rights under this section does not terminate the
|
||||
licenses of parties who have received copies or rights from you under
|
||||
this License. If your rights have been terminated and not permanently
|
||||
reinstated, you do not qualify to receive new licenses for the same
|
||||
material under section 10.
|
||||
|
||||
9. Acceptance Not Required for Having Copies.
|
||||
|
||||
You are not required to accept this License in order to receive or
|
||||
run a copy of the Program. Ancillary propagation of a covered work
|
||||
occurring solely as a consequence of using peer-to-peer transmission
|
||||
to receive a copy likewise does not require acceptance. However,
|
||||
nothing other than this License grants you permission to propagate or
|
||||
modify any covered work. These actions infringe copyright if you do
|
||||
not accept this License. Therefore, by modifying or propagating a
|
||||
covered work, you indicate your acceptance of this License to do so.
|
||||
|
||||
10. Automatic Licensing of Downstream Recipients.
|
||||
|
||||
Each time you convey a covered work, the recipient automatically
|
||||
receives a license from the original licensors, to run, modify and
|
||||
propagate that work, subject to this License. You are not responsible
|
||||
for enforcing compliance by third parties with this License.
|
||||
|
||||
An "entity transaction" is a transaction transferring control of an
|
||||
organization, or substantially all assets of one, or subdividing an
|
||||
organization, or merging organizations. If propagation of a covered
|
||||
work results from an entity transaction, each party to that
|
||||
transaction who receives a copy of the work also receives whatever
|
||||
licenses to the work the party's predecessor in interest had or could
|
||||
give under the previous paragraph, plus a right to possession of the
|
||||
Corresponding Source of the work from the predecessor in interest, if
|
||||
the predecessor has it or can get it with reasonable efforts.
|
||||
|
||||
You may not impose any further restrictions on the exercise of the
|
||||
rights granted or affirmed under this License. For example, you may
|
||||
not impose a license fee, royalty, or other charge for exercise of
|
||||
rights granted under this License, and you may not initiate litigation
|
||||
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||
any patent claim is infringed by making, using, selling, offering for
|
||||
sale, or importing the Program or any portion of it.
|
||||
|
||||
11. Patents.
|
||||
|
||||
A "contributor" is a copyright holder who authorizes use under this
|
||||
License of the Program or a work on which the Program is based. The
|
||||
work thus licensed is called the contributor's "contributor version".
|
||||
|
||||
A contributor's "essential patent claims" are all patent claims
|
||||
owned or controlled by the contributor, whether already acquired or
|
||||
hereafter acquired, that would be infringed by some manner, permitted
|
||||
by this License, of making, using, or selling its contributor version,
|
||||
but do not include claims that would be infringed only as a
|
||||
consequence of further modification of the contributor version. For
|
||||
purposes of this definition, "control" includes the right to grant
|
||||
patent sublicenses in a manner consistent with the requirements of
|
||||
this License.
|
||||
|
||||
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||
patent license under the contributor's essential patent claims, to
|
||||
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||
propagate the contents of its contributor version.
|
||||
|
||||
In the following three paragraphs, a "patent license" is any express
|
||||
agreement or commitment, however denominated, not to enforce a patent
|
||||
(such as an express permission to practice a patent or covenant not to
|
||||
sue for patent infringement). To "grant" such a patent license to a
|
||||
party means to make such an agreement or commitment not to enforce a
|
||||
patent against the party.
|
||||
|
||||
If you convey a covered work, knowingly relying on a patent license,
|
||||
and the Corresponding Source of the work is not available for anyone
|
||||
to copy, free of charge and under the terms of this License, through a
|
||||
publicly available network server or other readily accessible means,
|
||||
then you must either (1) cause the Corresponding Source to be so
|
||||
available, or (2) arrange to deprive yourself of the benefit of the
|
||||
patent license for this particular work, or (3) arrange, in a manner
|
||||
consistent with the requirements of this License, to extend the patent
|
||||
license to downstream recipients. "Knowingly relying" means you have
|
||||
actual knowledge that, but for the patent license, your conveying the
|
||||
covered work in a country, or your recipient's use of the covered work
|
||||
in a country, would infringe one or more identifiable patents in that
|
||||
country that you have reason to believe are valid.
|
||||
|
||||
If, pursuant to or in connection with a single transaction or
|
||||
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||
covered work, and grant a patent license to some of the parties
|
||||
receiving the covered work authorizing them to use, propagate, modify
|
||||
or convey a specific copy of the covered work, then the patent license
|
||||
you grant is automatically extended to all recipients of the covered
|
||||
work and works based on it.
|
||||
|
||||
A patent license is "discriminatory" if it does not include within
|
||||
the scope of its coverage, prohibits the exercise of, or is
|
||||
conditioned on the non-exercise of one or more of the rights that are
|
||||
specifically granted under this License. You may not convey a covered
|
||||
work if you are a party to an arrangement with a third party that is
|
||||
in the business of distributing software, under which you make payment
|
||||
to the third party based on the extent of your activity of conveying
|
||||
the work, and under which the third party grants, to any of the
|
||||
parties who would receive the covered work from you, a discriminatory
|
||||
patent license (a) in connection with copies of the covered work
|
||||
conveyed by you (or copies made from those copies), or (b) primarily
|
||||
for and in connection with specific products or compilations that
|
||||
contain the covered work, unless you entered into that arrangement,
|
||||
or that patent license was granted, prior to 28 March 2007.
|
||||
|
||||
Nothing in this License shall be construed as excluding or limiting
|
||||
any implied license or other defenses to infringement that may
|
||||
otherwise be available to you under applicable patent law.
|
||||
|
||||
12. No Surrender of Others' Freedom.
|
||||
|
||||
If conditions are imposed on you (whether by court order, agreement or
|
||||
otherwise) that contradict the conditions of this License, they do not
|
||||
excuse you from the conditions of this License. If you cannot convey a
|
||||
covered work so as to satisfy simultaneously your obligations under this
|
||||
License and any other pertinent obligations, then as a consequence you may
|
||||
not convey it at all. For example, if you agree to terms that obligate you
|
||||
to collect a royalty for further conveying from those to whom you convey
|
||||
the Program, the only way you could satisfy both those terms and this
|
||||
License would be to refrain entirely from conveying the Program.
|
||||
|
||||
13. Remote Network Interaction; Use with the GNU General Public License.
|
||||
|
||||
Notwithstanding any other provision of this License, if you modify the
|
||||
Program, your modified version must prominently offer all users
|
||||
interacting with it remotely through a computer network (if your version
|
||||
supports such interaction) an opportunity to receive the Corresponding
|
||||
Source of your version by providing access to the Corresponding Source
|
||||
from a network server at no charge, through some standard or customary
|
||||
means of facilitating copying of software. This Corresponding Source
|
||||
shall include the Corresponding Source for any work covered by version 3
|
||||
of the GNU General Public License that is incorporated pursuant to the
|
||||
following paragraph.
|
||||
|
||||
Notwithstanding any other provision of this License, you have
|
||||
permission to link or combine any covered work with a work licensed
|
||||
under version 3 of the GNU General Public License into a single
|
||||
combined work, and to convey the resulting work. The terms of this
|
||||
License will continue to apply to the part which is the covered work,
|
||||
but the work with which it is combined will remain governed by version
|
||||
3 of the GNU General Public License.
|
||||
|
||||
14. Revised Versions of this License.
|
||||
|
||||
The Free Software Foundation may publish revised and/or new versions of
|
||||
the GNU Affero General Public License from time to time. Such new versions
|
||||
will be similar in spirit to the present version, but may differ in detail to
|
||||
address new problems or concerns.
|
||||
|
||||
Each version is given a distinguishing version number. If the
|
||||
Program specifies that a certain numbered version of the GNU Affero General
|
||||
Public License "or any later version" applies to it, you have the
|
||||
option of following the terms and conditions either of that numbered
|
||||
version or of any later version published by the Free Software
|
||||
Foundation. If the Program does not specify a version number of the
|
||||
GNU Affero General Public License, you may choose any version ever published
|
||||
by the Free Software Foundation.
|
||||
|
||||
If the Program specifies that a proxy can decide which future
|
||||
versions of the GNU Affero General Public License can be used, that proxy's
|
||||
public statement of acceptance of a version permanently authorizes you
|
||||
to choose that version for the Program.
|
||||
|
||||
Later license versions may give you additional or different
|
||||
permissions. However, no additional obligations are imposed on any
|
||||
author or copyright holder as a result of your choosing to follow a
|
||||
later version.
|
||||
|
||||
15. Disclaimer of Warranty.
|
||||
|
||||
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||
|
||||
16. Limitation of Liability.
|
||||
|
||||
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||
SUCH DAMAGES.
|
||||
|
||||
17. Interpretation of Sections 15 and 16.
|
||||
|
||||
If the disclaimer of warranty and limitation of liability provided
|
||||
above cannot be given local legal effect according to their terms,
|
||||
reviewing courts shall apply local law that most closely approximates
|
||||
an absolute waiver of all civil liability in connection with the
|
||||
Program, unless a warranty or assumption of liability accompanies a
|
||||
copy of the Program in return for a fee.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
How to Apply These Terms to Your New Programs
|
||||
|
||||
If you develop a new program, and you want it to be of the greatest
|
||||
possible use to the public, the best way to achieve this is to make it
|
||||
free software which everyone can redistribute and change under these terms.
|
||||
|
||||
To do so, attach the following notices to the program. It is safest
|
||||
to attach them to the start of each source file to most effectively
|
||||
state the exclusion of warranty; and each file should have at least
|
||||
the "copyright" line and a pointer to where the full notice is found.
|
||||
|
||||
<one line to give the program's name and a brief idea of what it does.>
|
||||
Copyright (C) <year> <name of author>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU Affero General Public License as published
|
||||
by the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU Affero General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Affero General Public License
|
||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
If your software can interact with users remotely through a computer
|
||||
network, you should also make sure that it provides a way for users to
|
||||
get its source. For example, if your program is a web application, its
|
||||
interface could display a "Source" link that leads users to an archive
|
||||
of the code. There are many ways you could offer source, and different
|
||||
solutions will be better for different programs; see section 13 for the
|
||||
specific requirements.
|
||||
|
||||
You should also get your employer (if you work as a programmer) or school,
|
||||
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||
For more information on this, and how to apply and follow the GNU AGPL, see
|
||||
<https://www.gnu.org/licenses/>.
|
||||
@ -1,20 +0,0 @@
|
||||
dotnet build ../src/Connected.Runtime/Connected.Runtime.csproj
|
||||
dotnet build ../src/Connected.Configuration/Connected.Configuration.csproj
|
||||
dotnet build ../src/Connected.Threading/Connected.Threading.csproj
|
||||
dotnet build ../src/Connected.Interop/Connected.Interop.csproj
|
||||
dotnet build ../src/Connected.Hosting/Connected.Hosting.csproj
|
||||
dotnet build ../src/Connected.Globalization/Connected.Globalization.csproj
|
||||
dotnet build ../src/Connected.Collections/Connected.Collections.csproj
|
||||
dotnet build ../src/Connected.Middleware/Connected.Middleware.csproj
|
||||
dotnet build ../src/Connected.Security/Connected.Security.csproj
|
||||
dotnet build ../src/Connected.Validation/Connected.Validation.csproj
|
||||
dotnet build ../src/Connected.Net/Connected.Net.csproj
|
||||
dotnet build ../src/Connected.Notifications/Connected.Notifications.csproj
|
||||
dotnet build ../src/Connected.Caching/Connected.Caching.csproj
|
||||
dotnet build ../src/Connected.Entities/Connected.Entities.csproj
|
||||
dotnet build ../src/Connected.Expressions/Connected.Expressions.csproj
|
||||
dotnet build ../src/Connected.Data/Connected.Data.csproj
|
||||
dotnet build ../src/Connected.Services/Connected.Services.csproj
|
||||
dotnet build ../src/Connected.Rest/Connected.Rest.csproj
|
||||
dotnet build ../src/Connected.Instance/Connected.Instance.csproj
|
||||
dotnet build ../src/Connected.Framework/Connected.Framework.csproj
|
||||
1
dependencies/Connected
vendored
1
dependencies/Connected
vendored
@ -1 +0,0 @@
|
||||
Subproject commit 9eb9949950a4b99f31e8800eb41e1b97ec00f8be
|
||||
15
nuget.config
15
nuget.config
@ -1,15 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<configuration>
|
||||
<config>
|
||||
<add key="repositoryPath" value="%PACKAGEHOME%/External" />
|
||||
</config>
|
||||
|
||||
<packageRestore>
|
||||
<add key="enabled" value="True" />
|
||||
<add key="automatic" value="True" />
|
||||
</packageRestore>
|
||||
<packageSources>
|
||||
<add key="NuGet official package source" value="https://api.nuget.org/v3/index.json" />
|
||||
</packageSources>
|
||||
<disabledPackageSources />
|
||||
</configuration>
|
||||
@ -1,7 +1,6 @@
|
||||
using Connected.Annotations;
|
||||
using Connected.Caching.Net;
|
||||
using Microsoft.AspNetCore.Builder;
|
||||
using Microsoft.Extensions.Configuration;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
|
||||
[assembly: MicroService(MicroServiceType.Sys)]
|
||||
@ -25,7 +24,7 @@ internal class CachingStartup : Startup
|
||||
services.AddScoped(typeof(ICacheContext), typeof(CacheContext));
|
||||
}
|
||||
|
||||
protected override async Task OnInitialize(IConfiguration config)
|
||||
protected override async Task OnInitialize(Dictionary<string, string> args)
|
||||
{
|
||||
if (Services is not null && Services.GetService<ICachingService>() is ICachingService service)
|
||||
await service.Initialize();
|
||||
|
||||
@ -1,56 +1,36 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net7.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
|
||||
<Title>$(AssemblyName)</Title>
|
||||
<Authors>Tom PIT</Authors>
|
||||
<Copyright>2022 Tom PIT</Copyright>
|
||||
<PackageProjectUrl>https://git.tompit.com/Connected/Info</PackageProjectUrl>
|
||||
<PackageReadmeFile>README.md</PackageReadmeFile>
|
||||
<PackageTags>connected;platform;</PackageTags>
|
||||
<IncludeSymbols>True</IncludeSymbols>
|
||||
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
|
||||
<PackageLicenseFile>LICENSE</PackageLicenseFile>
|
||||
<PackageOutputPath>$(OutputPath)</PackageOutputPath>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.*-*" />
|
||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0-rc.2.22472.3" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Compile Update="SR.Designer.cs">
|
||||
<DesignTime>True</DesignTime>
|
||||
<AutoGen>True</AutoGen>
|
||||
<DependentUpon>SR.resx</DependentUpon>
|
||||
</Compile>
|
||||
<ProjectReference Include="..\..\..\Connected\src\Connected\Connected.csproj" />
|
||||
<ProjectReference Include="..\Connected.Interop\Connected.Interop.csproj" />
|
||||
<ProjectReference Include="..\Connected.Net\Connected.Net.csproj" />
|
||||
<ProjectReference Include="..\Connected.Runtime\Connected.Runtime.csproj" />
|
||||
<ProjectReference Include="..\Connected.Threading\Connected.Threading.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Update="SR.resx">
|
||||
<Generator>ResXFileCodeGenerator</Generator>
|
||||
<LastGenOutput>SR.Designer.cs</LastGenOutput>
|
||||
</EmbeddedResource>
|
||||
<Compile Update="SR.Designer.cs">
|
||||
<DesignTime>True</DesignTime>
|
||||
<AutoGen>True</AutoGen>
|
||||
<DependentUpon>SR.resx</DependentUpon>
|
||||
</Compile>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Include="..\..\LICENSE">
|
||||
<Pack>True</Pack>
|
||||
<PackagePath>\</PackagePath>
|
||||
</None>
|
||||
<None Include="..\..\README.md">
|
||||
<Pack>True</Pack>
|
||||
<PackagePath>\</PackagePath>
|
||||
</None>
|
||||
<EmbeddedResource Update="SR.resx">
|
||||
<Generator>ResXFileCodeGenerator</Generator>
|
||||
<LastGenOutput>SR.Designer.cs</LastGenOutput>
|
||||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Connected.Interop\Connected.Interop.csproj" />
|
||||
<ProjectReference Include="..\Connected.Net\Connected.Net.csproj" />
|
||||
<ProjectReference Include="..\Connected.Runtime\Connected.Runtime.csproj" />
|
||||
<ProjectReference Include="..\Connected.Threading\Connected.Threading.csproj" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
@ -4,19 +4,14 @@
|
||||
<TargetFramework>net7.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
|
||||
<Title>$(AssemblyName)</Title>
|
||||
<Authors>Tom PIT</Authors>
|
||||
<Copyright>2022 Tom PIT</Copyright>
|
||||
<PackageProjectUrl>https://git.tompit.com/Connected/Info</PackageProjectUrl>
|
||||
<PackageReadmeFile>README.md</PackageReadmeFile>
|
||||
<PackageTags>connected;platform;</PackageTags>
|
||||
<IncludeSymbols>True</IncludeSymbols>
|
||||
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
|
||||
<PackageLicenseFile>LICENSE</PackageLicenseFile>
|
||||
<PackageOutputPath>$(OutputPath)</PackageOutputPath>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\..\Connected\src\Connected\Connected.csproj" />
|
||||
<ProjectReference Include="..\Connected.Interop\Connected.Interop.csproj" />
|
||||
<ProjectReference Include="..\Connected.Runtime\Connected.Runtime.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Compile Update="SR.Designer.cs">
|
||||
<DesignTime>True</DesignTime>
|
||||
@ -32,20 +27,4 @@
|
||||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Include="..\..\LICENSE">
|
||||
<Pack>True</Pack>
|
||||
<PackagePath>\</PackagePath>
|
||||
</None>
|
||||
<None Include="..\..\README.md">
|
||||
<Pack>True</Pack>
|
||||
<PackagePath>\</PackagePath>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\dependencies\Connected\src\Connected\Connected.csproj" />
|
||||
<ProjectReference Include="..\Connected.Interop\Connected.Interop.csproj" />
|
||||
<ProjectReference Include="..\Connected.Runtime\Connected.Runtime.csproj" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
@ -1,16 +1,14 @@
|
||||
using Connected.Configuration.Authentication;
|
||||
using Connected.Configuration.Endpoints;
|
||||
using Microsoft.Extensions.Configuration;
|
||||
|
||||
namespace Connected.Configuration;
|
||||
|
||||
internal class ConfigurationService : IConfigurationService
|
||||
{
|
||||
public ConfigurationService(IConfiguration configuration)
|
||||
public ConfigurationService()
|
||||
{
|
||||
Endpoint = new EndpointConfiguration(configuration.GetSection("endpoint"));
|
||||
|
||||
Storage = new StorageConfiguration(configuration.GetSection("storage"));
|
||||
Endpoint = new EndpointConfiguration();
|
||||
Storage = new StorageConfiguration();
|
||||
}
|
||||
|
||||
public IEndpointConfiguration Endpoint { get; }
|
||||
|
||||
@ -1,34 +1,13 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net7.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
|
||||
<Title>$(AssemblyName)</Title>
|
||||
<Authors>Tom PIT</Authors>
|
||||
<Copyright>2022 Tom PIT</Copyright>
|
||||
<PackageProjectUrl>https://git.tompit.com/Connected/Info</PackageProjectUrl>
|
||||
<PackageReadmeFile>README.md</PackageReadmeFile>
|
||||
<PackageTags>connected;platform;</PackageTags>
|
||||
<IncludeSymbols>True</IncludeSymbols>
|
||||
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
|
||||
<PackageLicenseFile>LICENSE</PackageLicenseFile>
|
||||
<PackageOutputPath>$(OutputPath)</PackageOutputPath>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net7.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Include="..\..\LICENSE">
|
||||
<Pack>True</Pack>
|
||||
<PackagePath>\</PackagePath>
|
||||
</None>
|
||||
<None Include="..\..\README.md">
|
||||
<Pack>True</Pack>
|
||||
<PackagePath>\</PackagePath>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Connected.Runtime\Connected.Runtime.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Connected.Runtime\Connected.Runtime.csproj" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
@ -1,18 +1,19 @@
|
||||
using System.Collections.Immutable;
|
||||
using Microsoft.Extensions.Configuration;
|
||||
|
||||
namespace Connected.Configuration
|
||||
{
|
||||
internal class DatabaseConfiguration : IDatabaseConfiguration
|
||||
{
|
||||
private readonly List<string> _shards;
|
||||
private List<string> _shards;
|
||||
|
||||
public DatabaseConfiguration(IConfiguration configuration)
|
||||
public DatabaseConfiguration()
|
||||
{
|
||||
DefaultConnectionString = "";
|
||||
/*
|
||||
* TODO: read from config
|
||||
*/
|
||||
DefaultConnectionString = "server=PIT-ZBOOK\\sqlexpress; database=connected; trusted_connection=true;TrustServerCertificate=True;multiple active result sets=true";
|
||||
|
||||
_shards = new();
|
||||
configuration.Bind(this);
|
||||
configuration.Bind("shards", _shards);
|
||||
}
|
||||
|
||||
public string? DefaultConnectionString { get; init; }
|
||||
|
||||
@ -1,14 +1,7 @@
|
||||
using Microsoft.Extensions.Configuration;
|
||||
|
||||
namespace Connected.Configuration.Endpoints
|
||||
namespace Connected.Configuration.Endpoints
|
||||
{
|
||||
internal sealed class EndpointConfiguration : IEndpointConfiguration
|
||||
{
|
||||
public EndpointConfiguration(IConfiguration configuration)
|
||||
{
|
||||
configuration.Bind(this);
|
||||
}
|
||||
|
||||
public string? Address { get; set; }
|
||||
}
|
||||
}
|
||||
|
||||
@ -4,7 +4,7 @@ namespace Connected.Configuration
|
||||
{
|
||||
public interface IDatabaseConfiguration
|
||||
{
|
||||
string? DefaultConnectionString { get; }
|
||||
string DefaultConnectionString { get; }
|
||||
|
||||
ImmutableList<string> Shards { get; }
|
||||
}
|
||||
|
||||
@ -1,12 +1,10 @@
|
||||
using Microsoft.Extensions.Configuration;
|
||||
|
||||
namespace Connected.Configuration
|
||||
namespace Connected.Configuration
|
||||
{
|
||||
internal class StorageConfiguration : IStorageConfiguration
|
||||
{
|
||||
public StorageConfiguration(IConfiguration configuration)
|
||||
public StorageConfiguration()
|
||||
{
|
||||
Databases = new DatabaseConfiguration(configuration.GetSection("databases"));
|
||||
Databases = new DatabaseConfiguration();
|
||||
}
|
||||
|
||||
public IDatabaseConfiguration Databases { get; }
|
||||
|
||||
@ -1,28 +0,0 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net7.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
|
||||
<IsPackable>false</IsPackable>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
|
||||
<PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
|
||||
<PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
|
||||
<PackageReference Include="coverlet.collector" Version="3.1.2" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Folder Include="Storage\" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Connected.Data\Connected.Data.csproj" />
|
||||
<ProjectReference Include="..\Connected.Entities\Connected.Entities.csproj" />
|
||||
<ProjectReference Include="..\Connected.Expressions\Connected.Expressions.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
@ -1,134 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using Connected.Expressions;
|
||||
using Connected.Data.Sql;
|
||||
using Connected.Expressions.Translation;
|
||||
using System.Linq.Expressions;
|
||||
using Connected.Data.Storage;
|
||||
using System.Collections;
|
||||
using System.Reflection;
|
||||
using Connected.Entities;
|
||||
|
||||
namespace Connected.Data.Tests.Translation;
|
||||
|
||||
[TestClass]
|
||||
public class TranslatorTests
|
||||
{
|
||||
[TestMethod]
|
||||
public void Translator_GeneratesBasicSelectExpression_UsingTSQL()
|
||||
{
|
||||
var context = new ExpressionCompilationContext(new TSqlLanguage());
|
||||
|
||||
var translator = new Translator(context);
|
||||
|
||||
var data = SampleData.All();
|
||||
|
||||
var dataQueryable = data.AsQueryable();
|
||||
|
||||
var query = (from x in dataQueryable select x);
|
||||
|
||||
var operatorMethodInfo = QueryableMethods.SingleOrDefaultWithoutPredicate;
|
||||
|
||||
if (operatorMethodInfo.IsGenericMethod)
|
||||
{
|
||||
operatorMethodInfo = operatorMethodInfo.GetGenericArguments().Length == 2
|
||||
? operatorMethodInfo.MakeGenericMethod(typeof(DummyEntity), typeof(DummyEntity).GetGenericArguments().Single())
|
||||
: operatorMethodInfo.MakeGenericMethod(typeof(DummyEntity));
|
||||
}
|
||||
|
||||
var expr = Expression.Call(instance: null, method: operatorMethodInfo, arguments: new[] { query.Expression });
|
||||
|
||||
var result = translator.Translate(expr) as ProjectionExpression;
|
||||
|
||||
var select = result.Select;
|
||||
|
||||
Assert.IsInstanceOfType(select, typeof(SelectExpression));
|
||||
Assert.IsInstanceOfType(select.From, typeof(TableExpression));
|
||||
Assert.IsNull(select.Where, "Where should be null");
|
||||
Assert.IsNull(select.Take, "Take should be null");
|
||||
Assert.IsNull(select.Skip, "Skip should be null");
|
||||
Assert.AreEqual(0, select.GroupBy.Count);
|
||||
Assert.IsFalse(select.IsReverse);
|
||||
}
|
||||
|
||||
[TestMethod]
|
||||
public void Translator_GeneratesSelectExpression_WithWhere_UsingTSQL()
|
||||
{
|
||||
var context = new ExpressionCompilationContext(new TSqlLanguage());
|
||||
|
||||
var translator = new Translator(context);
|
||||
|
||||
var data = SampleData.All();
|
||||
|
||||
var dataQueryable = data.AsQueryable();
|
||||
|
||||
var query = (from x in dataQueryable where x.Id == 1 select x);
|
||||
|
||||
var operatorMethodInfo = QueryableMethods.SingleOrDefaultWithoutPredicate;
|
||||
|
||||
if (operatorMethodInfo.IsGenericMethod)
|
||||
{
|
||||
operatorMethodInfo = operatorMethodInfo.GetGenericArguments().Length == 2
|
||||
? operatorMethodInfo.MakeGenericMethod(typeof(DummyEntity), typeof(DummyEntity).GetGenericArguments().Single())
|
||||
: operatorMethodInfo.MakeGenericMethod(typeof(DummyEntity));
|
||||
}
|
||||
|
||||
var expr = Expression.Call(instance: null, method: operatorMethodInfo, arguments: new[] { query.Expression });
|
||||
|
||||
var result = translator.Translate(expr) as ProjectionExpression;
|
||||
|
||||
var select = result.Select;
|
||||
|
||||
Assert.IsInstanceOfType(select, typeof(SelectExpression));
|
||||
Assert.IsInstanceOfType(select.From, typeof(TableExpression));
|
||||
Assert.IsNotNull(select.Where, "Where should not be null");
|
||||
Assert.IsNull(select.Take, "Take should be null");
|
||||
Assert.IsNull(select.Skip, "Skip should be null");
|
||||
Assert.AreEqual(0, select.GroupBy.Count);
|
||||
Assert.IsFalse(select.IsReverse);
|
||||
}
|
||||
}
|
||||
|
||||
public record DummyEntity : Entity<long>;
|
||||
|
||||
internal static class SampleData
|
||||
{
|
||||
public static List<DummyEntity> All()
|
||||
{
|
||||
return new List<DummyEntity>
|
||||
{
|
||||
new DummyEntity{ Id = 1},
|
||||
new DummyEntity{ Id = 2},
|
||||
new DummyEntity{ Id = 3},
|
||||
new DummyEntity{ Id = 4},
|
||||
new DummyEntity{ Id = 5}
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
internal static class QueryableMethods
|
||||
{
|
||||
static QueryableMethods()
|
||||
{
|
||||
var queryableMethodGroups = typeof(Queryable)
|
||||
.GetMethods(BindingFlags.Public | BindingFlags.Static | BindingFlags.DeclaredOnly)
|
||||
.GroupBy(mi => mi.Name)
|
||||
.ToDictionary(e => e.Key, l => l.ToList());
|
||||
|
||||
SingleWithoutPredicate = GetMethod(nameof(Queryable.Single), 1, types => new[] { typeof(IQueryable<>).MakeGenericType(types[0]) });
|
||||
SingleOrDefaultWithoutPredicate = GetMethod(nameof(Queryable.SingleOrDefault), 1, types => new[] { typeof(IQueryable<>).MakeGenericType(types[0]) });
|
||||
|
||||
MethodInfo GetMethod(string name, int genericParameterCount, Func<Type[], Type[]> parameterGenerator)
|
||||
{
|
||||
return queryableMethodGroups[name].Single(mi => ((genericParameterCount == 0 && !mi.IsGenericMethod)
|
||||
|| (mi.IsGenericMethod && mi.GetGenericArguments().Length == genericParameterCount))
|
||||
&& mi.GetParameters().Select(e => e.ParameterType).SequenceEqual(parameterGenerator(mi.IsGenericMethod ? mi.GetGenericArguments() : Array.Empty<Type>())));
|
||||
}
|
||||
}
|
||||
|
||||
public static MethodInfo SingleWithoutPredicate { get; }
|
||||
public static MethodInfo SingleOrDefaultWithoutPredicate { get; }
|
||||
}
|
||||
@ -1 +0,0 @@
|
||||
global using Microsoft.VisualStudio.TestTools.UnitTesting;
|
||||
@ -4,21 +4,22 @@
|
||||
<TargetFramework>net7.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
|
||||
<Title>$(AssemblyName)</Title>
|
||||
<Authors>Tom PIT</Authors>
|
||||
<Copyright>2022 Tom PIT</Copyright>
|
||||
<PackageProjectUrl>https://git.tompit.com/Connected/Info</PackageProjectUrl>
|
||||
<PackageReadmeFile>README.md</PackageReadmeFile>
|
||||
<PackageTags>connected;platform;</PackageTags>
|
||||
<IncludeSymbols>True</IncludeSymbols>
|
||||
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
|
||||
<PackageLicenseFile>LICENSE</PackageLicenseFile>
|
||||
<PackageOutputPath>$(OutputPath)</PackageOutputPath>
|
||||
<GenerateDocumentationFile>False</GenerateDocumentationFile>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.*-*" />
|
||||
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.0-preview1.22279.3" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\..\Connected\src\Connected\Connected.csproj" />
|
||||
<ProjectReference Include="..\Connected.Caching\Connected.Caching.csproj" />
|
||||
<ProjectReference Include="..\Connected.Entities\Connected.Entities.csproj" />
|
||||
<ProjectReference Include="..\Connected.Expressions\Connected.Expressions.csproj" />
|
||||
<ProjectReference Include="..\Connected.Globalization\Connected.Globalization.csproj" />
|
||||
<ProjectReference Include="..\Connected.Interop\Connected.Interop.csproj" />
|
||||
<ProjectReference Include="..\Connected.Threading\Connected.Threading.csproj" />
|
||||
<ProjectReference Include="..\Connected.Validation\Connected.Validation.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
@ -36,24 +37,4 @@
|
||||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Include="..\..\LICENSE">
|
||||
<Pack>True</Pack>
|
||||
<PackagePath>\</PackagePath>
|
||||
</None>
|
||||
<None Include="..\..\README.md">
|
||||
<Pack>True</Pack>
|
||||
<PackagePath>\</PackagePath>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Connected.Caching\Connected.Caching.csproj" />
|
||||
<ProjectReference Include="..\Connected.Entities\Connected.Entities.csproj" />
|
||||
<ProjectReference Include="..\Connected.Expressions\Connected.Expressions.csproj" />
|
||||
<ProjectReference Include="..\Connected.Globalization\Connected.Globalization.csproj" />
|
||||
<ProjectReference Include="..\Connected.Interop\Connected.Interop.csproj" />
|
||||
<ProjectReference Include="..\Connected.Threading\Connected.Threading.csproj" />
|
||||
<ProjectReference Include="..\Connected.Validation\Connected.Validation.csproj" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
using System.Runtime.CompilerServices;
|
||||
using Connected.Annotations;
|
||||
using Connected.Annotations;
|
||||
using Connected.Data.DataProtection;
|
||||
using Connected.Data.Schema;
|
||||
using Connected.Data.Sharding;
|
||||
@ -8,7 +7,6 @@ using Connected.Entities.Storage;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
|
||||
[assembly: MicroService(MicroServiceType.Sys)]
|
||||
[assembly: InternalsVisibleTo("Connected.Data.Tests")]
|
||||
|
||||
namespace Connected.Data;
|
||||
|
||||
|
||||
@ -16,7 +16,7 @@ internal sealed class TSqlLinguist : Linguist
|
||||
|
||||
public override Expression Translate(Expression expression)
|
||||
{
|
||||
/*
|
||||
/*
|
||||
* fix up any order-by's
|
||||
*/
|
||||
expression = OrderByRewriter.Rewrite(Language, expression);
|
||||
|
||||
@ -152,11 +152,7 @@ internal class EntityStorage<TEntity> : IAsyncEnumerable<TEntity>, IStorage<TEnt
|
||||
|
||||
await Execute(new StorageContextArgs(operation));
|
||||
|
||||
var clone = entity.Clone();
|
||||
|
||||
ReturnValueBinder.Bind(operation, clone);
|
||||
|
||||
return clone;
|
||||
return entity;
|
||||
}
|
||||
/// <summary>
|
||||
/// Performs the update on the specified entity with optional concurrency callback support.
|
||||
@ -275,6 +271,10 @@ internal class EntityStorage<TEntity> : IAsyncEnumerable<TEntity>, IStorage<TEnt
|
||||
*/
|
||||
if (recordsAffected == 0 && args.Operation.Concurrency == DataConcurrencyMode.Enabled)
|
||||
throw new DBConcurrencyException($"{SR.ErrDataConcurrency} ({typeof(Entity).Name})");
|
||||
/*
|
||||
* Bind storage parameters with operation parameters.
|
||||
*/
|
||||
ReturnValueBinder.Bind(writer, args.Operation);
|
||||
|
||||
return recordsAffected;
|
||||
}
|
||||
|
||||
@ -6,36 +6,47 @@ using Connected.Interop;
|
||||
|
||||
namespace Connected.Data.Storage
|
||||
{
|
||||
internal static class ReturnValueBinder
|
||||
internal static class ReturnValueBinder
|
||||
{
|
||||
public static void Bind(IStorageOperation operation, object entity)
|
||||
public static void Bind(IStorageWriter w, IStorageOperation operation)
|
||||
{
|
||||
if (operation is null || operation.Parameters is null)
|
||||
List<PropertyInfo> properties = null;
|
||||
|
||||
if (w.Operation.Parameters is null)
|
||||
return;
|
||||
|
||||
foreach (var parameter in operation.Parameters)
|
||||
foreach (var parameter in w.Operation.Parameters)
|
||||
{
|
||||
if (parameter.Direction != ParameterDirection.ReturnValue && parameter.Direction != ParameterDirection.Output)
|
||||
continue;
|
||||
|
||||
if (parameter.Value == DBNull.Value)
|
||||
continue;
|
||||
|
||||
var properties = new List<PropertyInfo>();
|
||||
|
||||
var all = entity.GetType().GetProperties(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
|
||||
|
||||
foreach (var prop in all)
|
||||
if (properties is null)
|
||||
{
|
||||
if (prop.FindAttribute<ReturnValueAttribute>() is not null)
|
||||
properties.Add(prop);
|
||||
properties = new List<PropertyInfo>();
|
||||
|
||||
var all = operation.GetType().GetProperties(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
|
||||
|
||||
foreach (var prop in all)
|
||||
{
|
||||
if (prop.FindAttribute<ReturnValueAttribute>() is not null)
|
||||
properties.Add(prop);
|
||||
}
|
||||
}
|
||||
|
||||
PropertyInfo? property = null;
|
||||
PropertyInfo property = null;
|
||||
|
||||
foreach (var prop in properties)
|
||||
if (property is null)
|
||||
{
|
||||
if (string.Equals(prop.Name, parameter.Name, StringComparison.Ordinal))
|
||||
foreach (var prop in properties)
|
||||
{
|
||||
property = prop;
|
||||
break;
|
||||
if (string.Equals(prop.Name, parameter.Name, StringComparison.Ordinal))
|
||||
{
|
||||
property = prop;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -54,9 +65,9 @@ namespace Connected.Data.Storage
|
||||
if (property is null)
|
||||
{
|
||||
var candidates = new List<string>
|
||||
{
|
||||
parameter.Name.Replace("@", string.Empty)
|
||||
};
|
||||
{
|
||||
parameter.Name.Replace("@", string.Empty)
|
||||
};
|
||||
|
||||
foreach (var prop in properties)
|
||||
{
|
||||
@ -74,28 +85,26 @@ namespace Connected.Data.Storage
|
||||
}
|
||||
}
|
||||
|
||||
if (property is null)
|
||||
continue;
|
||||
|
||||
var existingValue = property.GetValue(entity);
|
||||
var overwriteAtt = property.FindAttribute<ReturnValueAttribute>();
|
||||
|
||||
if (overwriteAtt is null)
|
||||
continue;
|
||||
|
||||
switch (overwriteAtt.ValueBehavior)
|
||||
if (property is not null)
|
||||
{
|
||||
case PropertyValueBehavior.OverwriteDefault:
|
||||
var defaultValue = property.PropertyType.GetDefault();
|
||||
var existingValue = property.GetValue(operation);
|
||||
var overwriteAtt = property.FindAttribute<ReturnValueAttribute>();
|
||||
|
||||
if (Equals(existingValue, defaultValue))
|
||||
property.SetValue(entity, TypeConversion.Convert(parameter.Value, property.PropertyType));
|
||||
break;
|
||||
case PropertyValueBehavior.AlwaysOverwrite:
|
||||
property.SetValue(entity, TypeConversion.Convert(parameter.Value, property.PropertyType));
|
||||
break;
|
||||
switch (overwriteAtt.ValueBehavior)
|
||||
{
|
||||
case PropertyValueBehavior.OverwriteDefault:
|
||||
var defaultValue = property.PropertyType.GetDefault();
|
||||
|
||||
if (Equals(existingValue, defaultValue))
|
||||
property.SetValue(operation, parameter.Value);
|
||||
break;
|
||||
case PropertyValueBehavior.AlwaysOverwrite:
|
||||
property.SetValue(operation, parameter.Value);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -28,12 +28,10 @@ internal abstract class CommandBuilder
|
||||
|
||||
if (TryGetExisting(out StorageOperation? existing))
|
||||
{
|
||||
if (existing is null)
|
||||
return null;
|
||||
/*
|
||||
* We need to rebuild an instance since StorageOperation
|
||||
* is immutable
|
||||
*/
|
||||
* We need to rebuild an instance since StorageOperation
|
||||
* is immutable
|
||||
*/
|
||||
var result = new StorageOperation
|
||||
{
|
||||
CommandText = existing.CommandText,
|
||||
@ -45,21 +43,20 @@ internal abstract class CommandBuilder
|
||||
if (result.Parameters is null)
|
||||
return result;
|
||||
|
||||
foreach (var parameter in existing.Parameters)
|
||||
foreach (var parameter in result.Parameters)
|
||||
{
|
||||
if (ResolveProperty(parameter.Name) is PropertyInfo property)
|
||||
if (parameter.Direction == ParameterDirection.Input)
|
||||
{
|
||||
result.AddParameter(new StorageParameter
|
||||
if (ResolveProperty(parameter.Name) is PropertyInfo property)
|
||||
{
|
||||
Value = parameter.Direction switch
|
||||
result.AddParameter(new StorageParameter
|
||||
{
|
||||
ParameterDirection.Input => GetValue(property),
|
||||
_ => default
|
||||
},
|
||||
Name = parameter.Name,
|
||||
Type = parameter.Type,
|
||||
Direction = parameter.Direction
|
||||
});
|
||||
Value = GetValue(property),
|
||||
Name = parameter.Name,
|
||||
Type = parameter.Type,
|
||||
Direction = parameter.Direction
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net7.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
|
||||
<IsPackable>false</IsPackable>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
|
||||
<PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
|
||||
<PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
|
||||
<PackageReference Include="coverlet.collector" Version="3.1.2" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Connected.Entities\Connected.Entities.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Folder Include="Caching\" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
@ -1 +0,0 @@
|
||||
global using Microsoft.VisualStudio.TestTools.UnitTesting;
|
||||
@ -10,118 +10,118 @@ using System.Collections.Immutable;
|
||||
namespace Connected.Entities.Caching;
|
||||
|
||||
public abstract class EntityCacheClient<TEntity, TPrimaryKey> : StatefulCacheClient<TEntity, TPrimaryKey>, IEntityCacheClient<TEntity, TPrimaryKey>
|
||||
where TEntity : class, IPrimaryKey<TPrimaryKey>, IEntity
|
||||
where TPrimaryKey : notnull
|
||||
where TEntity : class, IPrimaryKey<TPrimaryKey>, IEntity
|
||||
where TPrimaryKey : notnull
|
||||
{
|
||||
protected EntityCacheClient(IEntityCacheContext context, string key) : base(context.Cache, key)
|
||||
{
|
||||
Context = context;
|
||||
}
|
||||
protected EntityCacheClient(IEntityCacheContext context, string key) : base(context.Cache, key)
|
||||
{
|
||||
Context = context;
|
||||
}
|
||||
|
||||
private IEntityCacheContext Context { get; }
|
||||
private IEntityCacheContext Context { get; }
|
||||
|
||||
protected override sealed async Task OnInitializing()
|
||||
{
|
||||
using var ctx = Context.ContextProvider.Create();
|
||||
protected override sealed async Task OnInitializing()
|
||||
{
|
||||
using var ctx = Context.ContextProvider.Create();
|
||||
|
||||
var transaction = ctx.GetService<ITransactionContext?>();
|
||||
var transaction = ctx.GetService<ITransactionContext?>();
|
||||
|
||||
try
|
||||
{
|
||||
if (await OnInitializing(ctx) is ImmutableList<TEntity> ds)
|
||||
{
|
||||
foreach (var r in ds)
|
||||
Set(r.Id, r, TimeSpan.Zero);
|
||||
}
|
||||
try
|
||||
{
|
||||
if (await OnInitializing(ctx) is ImmutableList<TEntity> ds)
|
||||
{
|
||||
foreach (var r in ds)
|
||||
Set(r.Id, r, TimeSpan.Zero);
|
||||
}
|
||||
|
||||
if (transaction is not null)
|
||||
await transaction.Commit();
|
||||
}
|
||||
catch
|
||||
{
|
||||
if (transaction is not null)
|
||||
await transaction.Rollback();
|
||||
if (transaction is not null)
|
||||
await transaction.Commit();
|
||||
}
|
||||
catch
|
||||
{
|
||||
if (transaction is not null)
|
||||
await transaction.Rollback();
|
||||
|
||||
throw;
|
||||
}
|
||||
}
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
protected virtual async Task<ImmutableList<TEntity>?> OnInitializing(IContext context)
|
||||
{
|
||||
if (context.GetService<IStorageProvider>() is not IStorageProvider db)
|
||||
return default;
|
||||
protected virtual async Task<ImmutableList<TEntity>?> OnInitializing(IContext context)
|
||||
{
|
||||
if (context.GetService<IStorageProvider>() is not IStorageProvider db)
|
||||
return default;
|
||||
|
||||
return await (from dc in db.Open<TEntity>()
|
||||
select dc).AsEntities();
|
||||
}
|
||||
return await (from dc in db.Open<TEntity>()
|
||||
select dc).AsEntities();
|
||||
}
|
||||
|
||||
protected override async Task OnInvalidate(TPrimaryKey id)
|
||||
{
|
||||
using var ctx = Context.ContextProvider.Create();
|
||||
var transaction = ctx.GetService<ITransactionContext>();
|
||||
protected override async Task OnInvalidate(TPrimaryKey id)
|
||||
{
|
||||
using var ctx = Context.ContextProvider.Create();
|
||||
var transaction = ctx.GetService<ITransactionContext>();
|
||||
|
||||
try
|
||||
{
|
||||
if ((await OnInvalidating(ctx, id)) is TEntity entity && entity is IPrimaryKey<TPrimaryKey> pk)
|
||||
Set(pk.Id, entity, TimeSpan.Zero);
|
||||
try
|
||||
{
|
||||
if (OnInvalidating(ctx, id) is TEntity entity && entity is IPrimaryKey<TPrimaryKey> pk)
|
||||
Set(pk.Id, entity, TimeSpan.Zero);
|
||||
|
||||
if (transaction is not null)
|
||||
await transaction.Commit();
|
||||
}
|
||||
catch
|
||||
{
|
||||
if (transaction is not null)
|
||||
await transaction.Rollback();
|
||||
if (transaction is not null)
|
||||
await transaction.Commit();
|
||||
}
|
||||
catch
|
||||
{
|
||||
if (transaction is not null)
|
||||
await transaction.Rollback();
|
||||
|
||||
throw;
|
||||
}
|
||||
}
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
protected virtual async Task<TEntity?> OnInvalidating(IContext context, TPrimaryKey id)
|
||||
{
|
||||
if (context.GetService<IStorageProvider>() is not IStorageProvider provider)
|
||||
return default;
|
||||
protected virtual async Task<TEntity?> OnInvalidating(IContext context, TPrimaryKey id)
|
||||
{
|
||||
if (context.GetService<IStorageProvider>() is not IStorageProvider provider)
|
||||
return default;
|
||||
|
||||
return await (from dc in provider.Open<TEntity>()
|
||||
where TypeComparer.Compare(dc.Id, id)
|
||||
select dc).AsEntity();
|
||||
}
|
||||
return await (from dc in provider.Open<TEntity>()
|
||||
where TypeComparer.Compare(dc.Id, id)
|
||||
select dc).AsEntity();
|
||||
}
|
||||
|
||||
async Task IEntityCacheClient<TEntity, TPrimaryKey>.Refresh(TPrimaryKey id)
|
||||
{
|
||||
await Refresh(id);
|
||||
}
|
||||
async Task IEntityCacheClient<TEntity, TPrimaryKey>.Refresh(TPrimaryKey id)
|
||||
{
|
||||
await Refresh(id);
|
||||
}
|
||||
|
||||
async Task IEntityCacheClient<TEntity, TPrimaryKey>.Remove(TPrimaryKey id)
|
||||
{
|
||||
await Remove(id);
|
||||
}
|
||||
async Task IEntityCacheClient<TEntity, TPrimaryKey>.Remove(TPrimaryKey id)
|
||||
{
|
||||
await Remove(id);
|
||||
}
|
||||
|
||||
protected override void Set(TPrimaryKey id, TEntity instance)
|
||||
{
|
||||
Set(id, instance, TimeSpan.Zero);
|
||||
}
|
||||
protected override void Set(TPrimaryKey id, TEntity instance)
|
||||
{
|
||||
Set(id, instance, TimeSpan.Zero);
|
||||
}
|
||||
|
||||
protected override void Set(TPrimaryKey id, TEntity instance, TimeSpan duration)
|
||||
{
|
||||
if (instance is IConcurrentEntity<TPrimaryKey> concurrent)
|
||||
{
|
||||
if (Get(id) is TEntity existing && existing is IConcurrentEntity<TPrimaryKey> existingConcurrent)
|
||||
{
|
||||
lock (existingConcurrent)
|
||||
{
|
||||
if (existingConcurrent.Sync != concurrent.Sync)
|
||||
throw new InvalidOperationException(SR.ErrConcurrent);
|
||||
protected override void Set(TPrimaryKey id, TEntity instance, TimeSpan duration)
|
||||
{
|
||||
if (instance is IConcurrentEntity<TPrimaryKey> concurrent)
|
||||
{
|
||||
if (Get(id) is TEntity existing && existing is IConcurrentEntity<TPrimaryKey> existingConcurrent)
|
||||
{
|
||||
lock (existingConcurrent)
|
||||
{
|
||||
if (existingConcurrent.Sync != concurrent.Sync)
|
||||
throw new InvalidOperationException(SR.ErrConcurrent);
|
||||
|
||||
concurrent.GetType().GetProperty(nameof(IConcurrentEntity<TPrimaryKey>.Sync))?.SetValue(concurrent, concurrent.Sync + 1);
|
||||
concurrent.GetType().GetProperty(nameof(IConcurrentEntity<TPrimaryKey>.Sync))?.SetValue(concurrent, concurrent.Sync + 1);
|
||||
|
||||
Set(id, instance, duration);
|
||||
Set(id, instance, duration);
|
||||
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
base.Set(id, instance, duration);
|
||||
}
|
||||
base.Set(id, instance, duration);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,50 +1,30 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net7.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
|
||||
<Title>$(AssemblyName)</Title>
|
||||
<Authors>Tom PIT</Authors>
|
||||
<Copyright>2022 Tom PIT</Copyright>
|
||||
<PackageProjectUrl>https://git.tompit.com/Connected/Info</PackageProjectUrl>
|
||||
<PackageReadmeFile>README.md</PackageReadmeFile>
|
||||
<PackageTags>connected;platform;</PackageTags>
|
||||
<IncludeSymbols>True</IncludeSymbols>
|
||||
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
|
||||
<PackageLicenseFile>LICENSE</PackageLicenseFile>
|
||||
<PackageOutputPath>$(OutputPath)</PackageOutputPath>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net7.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Compile Update="SR.Designer.cs">
|
||||
<DesignTime>True</DesignTime>
|
||||
<AutoGen>True</AutoGen>
|
||||
<DependentUpon>SR.resx</DependentUpon>
|
||||
</Compile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\..\Connected\src\Connected\Connected.csproj" />
|
||||
<ProjectReference Include="..\Connected.Caching\Connected.Caching.csproj" />
|
||||
<ProjectReference Include="..\Connected.Runtime\Connected.Runtime.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Update="SR.resx">
|
||||
<Generator>ResXFileCodeGenerator</Generator>
|
||||
<LastGenOutput>SR.Designer.cs</LastGenOutput>
|
||||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Update="SR.Designer.cs">
|
||||
<DesignTime>True</DesignTime>
|
||||
<AutoGen>True</AutoGen>
|
||||
<DependentUpon>SR.resx</DependentUpon>
|
||||
</Compile>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Include="..\..\LICENSE">
|
||||
<Pack>True</Pack>
|
||||
<PackagePath>\</PackagePath>
|
||||
</None>
|
||||
<None Include="..\..\README.md">
|
||||
<Pack>True</Pack>
|
||||
<PackagePath>\</PackagePath>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Update="SR.resx">
|
||||
<Generator>ResXFileCodeGenerator</Generator>
|
||||
<LastGenOutput>SR.Designer.cs</LastGenOutput>
|
||||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Connected.Caching\Connected.Caching.csproj" />
|
||||
<ProjectReference Include="..\Connected.Runtime\Connected.Runtime.csproj" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
@ -85,14 +85,6 @@ public static class EntitiesExtensions
|
||||
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)
|
||||
{
|
||||
if (source is null)
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net7.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
|
||||
<IsPackable>false</IsPackable>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
|
||||
<PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
|
||||
<PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
|
||||
<PackageReference Include="coverlet.collector" Version="3.1.2" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Connected.Expressions\Connected.Expressions.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Folder Include="Translation\" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
@ -1 +0,0 @@
|
||||
global using Microsoft.VisualStudio.TestTools.UnitTesting;
|
||||
@ -1,36 +1,15 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net7.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
|
||||
<Title>$(AssemblyName)</Title>
|
||||
<Authors>Tom PIT</Authors>
|
||||
<Copyright>2022 Tom PIT</Copyright>
|
||||
<PackageProjectUrl>https://git.tompit.com/Connected/Info</PackageProjectUrl>
|
||||
<PackageReadmeFile>README.md</PackageReadmeFile>
|
||||
<PackageTags>connected;platform;</PackageTags>
|
||||
<IncludeSymbols>True</IncludeSymbols>
|
||||
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
|
||||
<PackageLicenseFile>LICENSE</PackageLicenseFile>
|
||||
<PackageOutputPath>$(OutputPath)</PackageOutputPath>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net7.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Include="..\..\LICENSE">
|
||||
<Pack>True</Pack>
|
||||
<PackagePath>\</PackagePath>
|
||||
</None>
|
||||
<None Include="..\..\README.md">
|
||||
<Pack>True</Pack>
|
||||
<PackagePath>\</PackagePath>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Connected.Collections\Connected.Collections.csproj" />
|
||||
<ProjectReference Include="..\Connected.Entities\Connected.Entities.csproj" />
|
||||
<ProjectReference Include="..\Connected.Interop\Connected.Interop.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Connected.Collections\Connected.Collections.csproj" />
|
||||
<ProjectReference Include="..\Connected.Entities\Connected.Entities.csproj" />
|
||||
<ProjectReference Include="..\Connected.Interop\Connected.Interop.csproj" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
@ -3,67 +3,44 @@ using Connected.Expressions.Formatters;
|
||||
using Connected.Expressions.Translation;
|
||||
using System.Collections.ObjectModel;
|
||||
using System.Linq.Expressions;
|
||||
using System.Runtime.ExceptionServices;
|
||||
|
||||
namespace Connected.Expressions;
|
||||
|
||||
public sealed class SelectExpression : AliasedExpression
|
||||
{
|
||||
public SelectExpression(Alias alias, IEnumerable<ColumnDeclaration> columns, Expression from, Expression? where,
|
||||
IEnumerable<OrderExpression>? orderBy, IEnumerable<Expression>? groupBy, bool isDistinct, Expression? skip, Expression? take, bool isReverse)
|
||||
: base(DatabaseExpressionType.Select, typeof(void), alias)
|
||||
{
|
||||
Columns = columns.ToReadOnly();
|
||||
IsDistinct = isDistinct;
|
||||
From = from;
|
||||
Where = where;
|
||||
OrderBy = orderBy?.ToReadOnly();
|
||||
GroupBy = groupBy?.ToReadOnly();
|
||||
Take = take;
|
||||
Skip = skip;
|
||||
IsReverse = isReverse;
|
||||
}
|
||||
public SelectExpression(Alias alias, IEnumerable<ColumnDeclaration> columns, Expression from, Expression? where,
|
||||
IEnumerable<OrderExpression>? orderBy, IEnumerable<Expression>? groupBy, bool isDistinct, Expression? skip, Expression? take, bool isReverse)
|
||||
: base(DatabaseExpressionType.Select, typeof(void), alias)
|
||||
{
|
||||
Columns = columns.ToReadOnly();
|
||||
IsDistinct = isDistinct;
|
||||
From = from;
|
||||
Where = where;
|
||||
OrderBy = orderBy?.ToReadOnly();
|
||||
GroupBy = groupBy?.ToReadOnly();
|
||||
Take = take;
|
||||
Skip = skip;
|
||||
IsReverse = isReverse;
|
||||
}
|
||||
|
||||
public SelectExpression(Alias alias, IEnumerable<ColumnDeclaration> columns, Expression from, Expression? where, IEnumerable<OrderExpression>? orderBy, IEnumerable<Expression>? groupBy)
|
||||
: this(alias, columns, from, where, orderBy, groupBy, false, null, null, false)
|
||||
{
|
||||
}
|
||||
public SelectExpression(Alias alias, IEnumerable<ColumnDeclaration> columns, Expression from, Expression? where, IEnumerable<OrderExpression>? orderBy, IEnumerable<Expression>? groupBy)
|
||||
: this(alias, columns, from, where, orderBy, groupBy, false, null, null, false)
|
||||
{
|
||||
}
|
||||
|
||||
public SelectExpression(Alias alias, IEnumerable<ColumnDeclaration> columns, Expression from, Expression? where)
|
||||
: this(alias, columns, from, where, null, null)
|
||||
{
|
||||
}
|
||||
public SelectExpression(Alias alias, IEnumerable<ColumnDeclaration> columns, Expression from, Expression? where)
|
||||
: this(alias, columns, from, where, null, null)
|
||||
{
|
||||
}
|
||||
|
||||
public ReadOnlyCollection<ColumnDeclaration> Columns { get; }
|
||||
public Expression From { get; }
|
||||
public Expression? Where { get; }
|
||||
public ReadOnlyCollection<OrderExpression>? OrderBy { get; }
|
||||
public ReadOnlyCollection<Expression>? GroupBy { get; }
|
||||
public bool IsDistinct { get; }
|
||||
public Expression? Skip { get; }
|
||||
public Expression? Take { get; }
|
||||
public bool IsReverse { get; }
|
||||
public string QueryText => SqlFormatter.Format(this);
|
||||
|
||||
public override int GetHashCode()
|
||||
{
|
||||
return HashCode.Combine(HashCode.Combine(Alias, Columns, From, Where, OrderBy), GroupBy, IsDistinct, Skip, Take, IsReverse);
|
||||
}
|
||||
|
||||
public override bool Equals(object? obj)
|
||||
{
|
||||
if (obj is not SelectExpression second)
|
||||
return false;
|
||||
|
||||
return Alias == second.Alias
|
||||
&& Columns == second.Columns
|
||||
&& From == second.From
|
||||
&& Where == second.Where
|
||||
&& OrderBy == second.OrderBy
|
||||
&& GroupBy == second.GroupBy
|
||||
&& IsDistinct == second.IsDistinct
|
||||
&& Skip == second.Skip
|
||||
&& Take == second.Take
|
||||
&& IsReverse == second.IsReverse;
|
||||
}
|
||||
public ReadOnlyCollection<ColumnDeclaration> Columns { get; }
|
||||
public Expression From { get; }
|
||||
public Expression? Where { get; }
|
||||
public ReadOnlyCollection<OrderExpression>? OrderBy { get; }
|
||||
public ReadOnlyCollection<Expression>? GroupBy { get; }
|
||||
public bool IsDistinct { get; }
|
||||
public Expression? Skip { get; }
|
||||
public Expression? Take { get; }
|
||||
public bool IsReverse { get; }
|
||||
public string QueryText => SqlFormatter.Format(this);
|
||||
}
|
||||
@ -6,7 +6,6 @@ using System.Text;
|
||||
using Connected.Expressions.Languages;
|
||||
using Connected.Expressions.Translation;
|
||||
using Connected.Expressions.Visitors;
|
||||
using Connected.Interop;
|
||||
|
||||
namespace Connected.Expressions.Formatters;
|
||||
|
||||
@ -251,15 +250,6 @@ public class SqlFormatter : DatabaseVisitor
|
||||
return m;
|
||||
}
|
||||
}
|
||||
else if (string.Equals(m.Method.Name, "Compare", StringComparison.Ordinal) && m.Method.DeclaringType == typeof(TypeComparer))
|
||||
{
|
||||
Write(OpenBracket);
|
||||
Visit(m.Arguments[0]);
|
||||
Write(" = ");
|
||||
Visit(m.Arguments[1]);
|
||||
Write(CloseBracket);
|
||||
return m;
|
||||
}
|
||||
|
||||
throw new NotSupportedException($"The method '{m.Method.Name}' is not supported");
|
||||
}
|
||||
|
||||
@ -61,7 +61,7 @@ public class Translator
|
||||
|
||||
var result = ComparisonRewriter.Rewrite(rbound);
|
||||
|
||||
result = WhereClauseRewriter.Rewrite(context, result);
|
||||
//result = WhereClauseRewriter.Rewrite(context, result);
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
@ -77,7 +77,7 @@ public abstract class DatabaseVisitor : ExpressionVisitor
|
||||
|
||||
protected virtual Expression VisitWhere(Expression whereExpression)
|
||||
{
|
||||
return Visit(whereExpression);
|
||||
return whereExpression;
|
||||
}
|
||||
protected static SelectExpression UpdateSelect(SelectExpression expression, Expression from, Expression? where,
|
||||
IEnumerable<OrderExpression>? orderBy, IEnumerable<Expression> groupBy, Expression? skip, Expression? take,
|
||||
|
||||
@ -1,60 +0,0 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net7.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
<RootNamespace>$(MSBuildProjectName.Replace(" ", "_"))</RootNamespace>
|
||||
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
|
||||
<Title>$(AssemblyName)</Title>
|
||||
<Authors>Tom PIT ltd</Authors>
|
||||
<Copyright>Tom PIT ltd</Copyright>
|
||||
<PackageProjectUrl>https://git.tompit.com/Connected/Info</PackageProjectUrl>
|
||||
<PackageReadmeFile>README.md</PackageReadmeFile>
|
||||
<PackageTags>connected;platform;</PackageTags>
|
||||
<PackageReleaseNotes></PackageReleaseNotes>
|
||||
<IncludeSymbols>True</IncludeSymbols>
|
||||
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
|
||||
<PackageLicenseFile>LICENSE</PackageLicenseFile>
|
||||
<PackageOutputPath>$(OutputPath)</PackageOutputPath>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Connected.Caching" Version="1.0.*-*" />
|
||||
<PackageReference Include="Connected.Collections" Version="1.0.*-*" />
|
||||
<PackageReference Include="Connected.Configuration" Version="1.0.*-*" />
|
||||
<PackageReference Include="Connected.Data" Version="1.0.*-*" />
|
||||
<PackageReference Include="Connected.Entities" Version="1.0.*-*" />
|
||||
<PackageReference Include="Connected.Expressions" Version="1.0.*-*" />
|
||||
<PackageReference Include="Connected.Globalization" Version="1.0.*-*" />
|
||||
<PackageReference Include="Connected.Hosting" Version="1.0.*-*" />
|
||||
<PackageReference Include="Connected.Instance" Version="1.0.*-*" />
|
||||
<PackageReference Include="Connected.Interop" Version="1.0.*-*" />
|
||||
<PackageReference Include="Connected.Middleware" Version="1.0.*-*" />
|
||||
<PackageReference Include="Connected.Net" Version="1.0.*-*" />
|
||||
<PackageReference Include="Connected.Notifications" Version="1.0.*-*" />
|
||||
<PackageReference Include="Connected.Rest" Version="1.0.*-*" />
|
||||
<PackageReference Include="Connected.Runtime" Version="1.0.*-*" />
|
||||
<PackageReference Include="Connected.Security" Version="1.0.*-*" />
|
||||
<PackageReference Include="Connected.Services" Version="1.0.*-*" />
|
||||
<PackageReference Include="Connected.Threading" Version="1.0.*-*" />
|
||||
<PackageReference Include="Connected.Validation" Version="1.0.*-*" />
|
||||
<PackageReference Include="Nerdbank.GitVersioning" Version="3.5.119" PrivateAssets="all" Condition="!Exists('packages.config')" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Include="..\..\LICENSE">
|
||||
<Pack>True</Pack>
|
||||
<PackagePath>\</PackagePath>
|
||||
</None>
|
||||
<None Include="..\..\README.md">
|
||||
<Pack>True</Pack>
|
||||
<PackagePath>\</PackagePath>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
|
||||
<Target Name="CopyPackages" AfterTargets="Pack">
|
||||
<Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).nupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" />
|
||||
<Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).snupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" />
|
||||
</Target>
|
||||
</Project>
|
||||
@ -1,14 +0,0 @@
|
||||
{
|
||||
"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json",
|
||||
"version": "1.0-prerelease",
|
||||
"semVer1NumericIdentifierPadding": 4,
|
||||
"nugetPackageVersion": {
|
||||
"semVer": 2, // optional. Set to either 1 or 2 to control how the NuGet package version string is generated. Default is 1.
|
||||
"precision": "build" // optional. Use when you want to use a more or less precise package version than the default major.minor.build.
|
||||
},
|
||||
"cloudBuild": {
|
||||
"buildNumber": {
|
||||
"enabled": true
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,34 +1,14 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net7.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
|
||||
<Title>$(AssemblyName)</Title>
|
||||
<Authors>Tom PIT</Authors>
|
||||
<Copyright>2022 Tom PIT</Copyright>
|
||||
<PackageProjectUrl>https://git.tompit.com/Connected/Info</PackageProjectUrl>
|
||||
<PackageReadmeFile>README.md</PackageReadmeFile>
|
||||
<PackageTags>connected;platform;</PackageTags>
|
||||
<IncludeSymbols>True</IncludeSymbols>
|
||||
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
|
||||
<PackageLicenseFile>LICENSE</PackageLicenseFile>
|
||||
<PackageOutputPath>$(OutputPath)</PackageOutputPath>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net7.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Include="..\..\LICENSE">
|
||||
<Pack>True</Pack>
|
||||
<PackagePath>\</PackagePath>
|
||||
</None>
|
||||
<None Include="..\..\README.md">
|
||||
<Pack>True</Pack>
|
||||
<PackagePath>\</PackagePath>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\..\Connected\src\Connected\Connected.csproj" />
|
||||
<ProjectReference Include="..\Connected.Runtime\Connected.Runtime.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Connected.Runtime\Connected.Runtime.csproj" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
@ -1,50 +1,29 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net7.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
|
||||
<Title>$(AssemblyName)</Title>
|
||||
<Authors>Tom PIT</Authors>
|
||||
<Copyright>2022 Tom PIT</Copyright>
|
||||
<PackageProjectUrl>https://git.tompit.com/Connected/Info</PackageProjectUrl>
|
||||
<PackageReadmeFile>README.md</PackageReadmeFile>
|
||||
<PackageTags>connected;platform;</PackageTags>
|
||||
<IncludeSymbols>True</IncludeSymbols>
|
||||
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
|
||||
<PackageLicenseFile>LICENSE</PackageLicenseFile>
|
||||
<PackageOutputPath>$(OutputPath)</PackageOutputPath>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net7.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.*-*" />
|
||||
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.*-*" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0-rc.2.22472.3" />
|
||||
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0-rc.2.22472.3" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Compile Update="SR.Designer.cs">
|
||||
<DesignTime>True</DesignTime>
|
||||
<AutoGen>True</AutoGen>
|
||||
<DependentUpon>SR.resx</DependentUpon>
|
||||
</Compile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Update="SR.Designer.cs">
|
||||
<DesignTime>True</DesignTime>
|
||||
<AutoGen>True</AutoGen>
|
||||
<DependentUpon>SR.resx</DependentUpon>
|
||||
</Compile>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Update="SR.resx">
|
||||
<Generator>ResXFileCodeGenerator</Generator>
|
||||
<LastGenOutput>SR.Designer.cs</LastGenOutput>
|
||||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Update="SR.resx">
|
||||
<Generator>ResXFileCodeGenerator</Generator>
|
||||
<LastGenOutput>SR.Designer.cs</LastGenOutput>
|
||||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Include="..\..\LICENSE">
|
||||
<Pack>True</Pack>
|
||||
<PackagePath>\</PackagePath>
|
||||
</None>
|
||||
<None Include="..\..\README.md">
|
||||
<Pack>True</Pack>
|
||||
<PackagePath>\</PackagePath>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
@ -1,65 +1,45 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net7.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
<RootNamespace>$(MSBuildProjectName.Replace(" ", "_"))</RootNamespace>
|
||||
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
|
||||
<Title>$(AssemblyName)</Title>
|
||||
<Authors>Tom PIT</Authors>
|
||||
<Copyright>2022 Tom PIT</Copyright>
|
||||
<PackageProjectUrl>https://git.tompit.com/Connected/Info</PackageProjectUrl>
|
||||
<PackageReadmeFile>README.md</PackageReadmeFile>
|
||||
<PackageTags>connected;platform;</PackageTags>
|
||||
<IncludeSymbols>True</IncludeSymbols>
|
||||
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
|
||||
<PackageLicenseFile>LICENSE</PackageLicenseFile>
|
||||
<PackageOutputPath>$(OutputPath)</PackageOutputPath>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net7.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
<RootNamespace>$(MSBuildProjectName.Replace(" ", "_"))</RootNamespace>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Compile Update="SR.Designer.cs">
|
||||
<DependentUpon>SR.resx</DependentUpon>
|
||||
<DesignTime>True</DesignTime>
|
||||
<AutoGen>True</AutoGen>
|
||||
</Compile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Update="SR.Designer.cs">
|
||||
<DependentUpon>SR.resx</DependentUpon>
|
||||
<DesignTime>True</DesignTime>
|
||||
<AutoGen>True</AutoGen>
|
||||
</Compile>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Update="SR.resx">
|
||||
<LastGenOutput>SR.Designer.cs</LastGenOutput>
|
||||
<Generator>ResXFileCodeGenerator</Generator>
|
||||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Update="SR.resx">
|
||||
<LastGenOutput>SR.Designer.cs</LastGenOutput>
|
||||
<Generator>ResXFileCodeGenerator</Generator>
|
||||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Include="..\..\LICENSE">
|
||||
<Pack>True</Pack>
|
||||
<PackagePath>\</PackagePath>
|
||||
</None>
|
||||
<None Include="..\..\README.md">
|
||||
<Pack>True</Pack>
|
||||
<PackagePath>\</PackagePath>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Connected.Caching\Connected.Caching.csproj" />
|
||||
<ProjectReference Include="..\Connected.Collections\Connected.Collections.csproj" />
|
||||
<ProjectReference Include="..\Connected.Configuration\Connected.Configuration.csproj" />
|
||||
<ProjectReference Include="..\Connected.Data\Connected.Data.csproj" />
|
||||
<ProjectReference Include="..\Connected.Entities\Connected.Entities.csproj" />
|
||||
<ProjectReference Include="..\Connected.Globalization\Connected.Globalization.csproj" />
|
||||
<ProjectReference Include="..\Connected.Hosting\Connected.Hosting.csproj" />
|
||||
<ProjectReference Include="..\Connected.Interop\Connected.Interop.csproj" />
|
||||
<ProjectReference Include="..\Connected.Net\Connected.Net.csproj" />
|
||||
<ProjectReference Include="..\Connected.Notifications\Connected.Notifications.csproj" />
|
||||
<ProjectReference Include="..\Connected.Rest\Connected.Rest.csproj" />
|
||||
<ProjectReference Include="..\Connected.Runtime\Connected.Runtime.csproj" />
|
||||
<ProjectReference Include="..\Connected.Security\Connected.Security.csproj" />
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\..\Connected\src\Connected\Connected.csproj" />
|
||||
<ProjectReference Include="..\Connected.Caching\Connected.Caching.csproj" />
|
||||
<ProjectReference Include="..\Connected.Collections\Connected.Collections.csproj" />
|
||||
<ProjectReference Include="..\Connected.Data\Connected.Data.csproj" />
|
||||
<ProjectReference Include="..\Connected.Entities\Connected.Entities.csproj" />
|
||||
<ProjectReference Include="..\Connected.Globalization\Connected.Globalization.csproj" />
|
||||
<ProjectReference Include="..\Connected.Hosting\Connected.Hosting.csproj" />
|
||||
<ProjectReference Include="..\Connected.Interop\Connected.Interop.csproj" />
|
||||
<ProjectReference Include="..\Connected.Notifications\Connected.Notifications.csproj" />
|
||||
<ProjectReference Include="..\Connected.Rest\Connected.Rest.csproj" />
|
||||
<ProjectReference Include="..\Connected.Security\Connected.Security.csproj" />
|
||||
<ProjectReference Include="..\Connected.Services\Connected.Services.csproj" />
|
||||
<ProjectReference Include="..\Connected.Threading\Connected.Threading.csproj" />
|
||||
<ProjectReference Include="..\Connected.Validation\Connected.Validation.csproj" />
|
||||
</ItemGroup>
|
||||
<ProjectReference Include="..\Connected.Configuration\Connected.Configuration.csproj" />
|
||||
<ProjectReference Include="..\Connected.Net\Connected.Net.csproj" />
|
||||
<ProjectReference Include="..\Connected.Runtime\Connected.Runtime.csproj" />
|
||||
<ProjectReference Include="..\Connected.Threading\Connected.Threading.csproj" />
|
||||
<ProjectReference Include="..\Connected.Validation\Connected.Validation.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
using Connected.Interop;
|
||||
using Microsoft.AspNetCore.Builder;
|
||||
using Microsoft.Extensions.Configuration;
|
||||
|
||||
namespace Connected.Instance
|
||||
{
|
||||
@ -8,16 +7,9 @@ namespace Connected.Instance
|
||||
{
|
||||
internal static WebApplication Host { get; private set; }
|
||||
|
||||
internal static async Task StartAsync(IConfiguration config)
|
||||
internal static async Task StartAsync(Dictionary<string, string> args)
|
||||
{
|
||||
var options = new WebApplicationOptions();
|
||||
config.Bind(options);
|
||||
|
||||
var builder = WebApplication
|
||||
.CreateBuilder(options);
|
||||
|
||||
builder.Configuration.AddConfiguration(config);
|
||||
|
||||
var builder = WebApplication.CreateBuilder(UnpackArguments(args));
|
||||
var startups = Assemblies.QueryImplementations<IStartup>();
|
||||
|
||||
foreach (var assembly in Assemblies.All)
|
||||
@ -40,16 +32,16 @@ namespace Connected.Instance
|
||||
foreach (var startup in startups)
|
||||
{
|
||||
if (startup.CreateInstance<IStartup>() is IStartup start)
|
||||
await start.Initialize(config);
|
||||
await start.Initialize(args);
|
||||
}
|
||||
|
||||
foreach (var startup in startups)
|
||||
{
|
||||
if (startup.CreateInstance<IStartup>() is IStartup start)
|
||||
await start.Start(config);
|
||||
await start.Start(args);
|
||||
}
|
||||
|
||||
if (config.GetValue<string?>("entitySynchronization") is string entities)
|
||||
if (args.TryGetValue("entitySynchronization", out string? entities))
|
||||
await EntitySynchronizer.Synchronize(Host.Services, entities);
|
||||
|
||||
await Host.RunAsync();
|
||||
|
||||
@ -1,12 +1,10 @@
|
||||
using Microsoft.Extensions.Configuration;
|
||||
|
||||
namespace Connected.Instance
|
||||
namespace Connected.Instance
|
||||
{
|
||||
public static class Start
|
||||
{
|
||||
public static async Task ConfigureAsync(IConfiguration config)
|
||||
public static async Task ConfigureAsync(Dictionary<string, string> args)
|
||||
{
|
||||
await Instance.StartAsync(config);
|
||||
await Instance.StartAsync(args);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,22 +1,16 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net7.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
|
||||
<Title>$(AssemblyName)</Title>
|
||||
<Authors>Tom PIT</Authors>
|
||||
<Copyright>2022 Tom PIT</Copyright>
|
||||
<PackageProjectUrl>https://git.tompit.com/Connected/Info</PackageProjectUrl>
|
||||
<PackageReadmeFile>README.md</PackageReadmeFile>
|
||||
<PackageTags>connected;platform;</PackageTags>
|
||||
<IncludeSymbols>True</IncludeSymbols>
|
||||
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
|
||||
<PackageLicenseFile>LICENSE</PackageLicenseFile>
|
||||
<PackageOutputPath>$(OutputPath)</PackageOutputPath>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\..\Connected\src\Connected\Connected.csproj" />
|
||||
<ProjectReference Include="..\Connected.Runtime\Connected.Runtime.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Compile Update="SR.Designer.cs">
|
||||
<DesignTime>True</DesignTime>
|
||||
@ -32,18 +26,4 @@
|
||||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Include="..\..\LICENSE">
|
||||
<Pack>True</Pack>
|
||||
<PackagePath>\</PackagePath>
|
||||
</None>
|
||||
<None Include="..\..\README.md">
|
||||
<Pack>True</Pack>
|
||||
<PackagePath>\</PackagePath>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Connected.Runtime\Connected.Runtime.csproj" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
@ -4,32 +4,11 @@
|
||||
<TargetFramework>net7.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
|
||||
<Title>$(AssemblyName)</Title>
|
||||
<Authors>Tom PIT</Authors>
|
||||
<Copyright>2022 Tom PIT</Copyright>
|
||||
<PackageProjectUrl>https://git.tompit.com/Connected/Info</PackageProjectUrl>
|
||||
<PackageReadmeFile>README.md</PackageReadmeFile>
|
||||
<PackageTags>connected;platform;</PackageTags>
|
||||
<IncludeSymbols>True</IncludeSymbols>
|
||||
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
|
||||
<PackageLicenseFile>LICENSE</PackageLicenseFile>
|
||||
<PackageOutputPath>$(OutputPath)</PackageOutputPath>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Include="..\..\LICENSE">
|
||||
<Pack>True</Pack>
|
||||
<PackagePath>\</PackagePath>
|
||||
</None>
|
||||
<None Include="..\..\README.md">
|
||||
<Pack>True</Pack>
|
||||
<PackagePath>\</PackagePath>
|
||||
</None>
|
||||
<ProjectReference Include="..\Connected.Collections\Connected.Collections.csproj" />
|
||||
<ProjectReference Include="..\Connected.Configuration\Connected.Configuration.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Connected.Collections\Connected.Collections.csproj" />
|
||||
<ProjectReference Include="..\Connected.Configuration\Connected.Configuration.csproj" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
@ -1,58 +1,38 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net7.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
|
||||
<Title>$(AssemblyName)</Title>
|
||||
<Authors>Tom PIT</Authors>
|
||||
<Copyright>2022 Tom PIT</Copyright>
|
||||
<PackageProjectUrl>https://git.tompit.com/Connected/Info</PackageProjectUrl>
|
||||
<PackageReadmeFile>README.md</PackageReadmeFile>
|
||||
<PackageTags>connected;platform;</PackageTags>
|
||||
<IncludeSymbols>True</IncludeSymbols>
|
||||
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
|
||||
<PackageLicenseFile>LICENSE</PackageLicenseFile>
|
||||
<PackageOutputPath>$(OutputPath)</PackageOutputPath>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net7.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.*-*" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="7.0.*-*" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="7.0.*-*" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="7.0.0-rc.2.22476.2" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="7.0.0-rc.2.22476.2" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Compile Update="SR.Designer.cs">
|
||||
<DesignTime>True</DesignTime>
|
||||
<AutoGen>True</AutoGen>
|
||||
<DependentUpon>SR.resx</DependentUpon>
|
||||
</Compile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\..\Connected\src\Connected\Connected.csproj" />
|
||||
<ProjectReference Include="..\Connected.Configuration\Connected.Configuration.csproj" />
|
||||
<ProjectReference Include="..\Connected.Hosting\Connected.Hosting.csproj" />
|
||||
<ProjectReference Include="..\Connected.Runtime\Connected.Runtime.csproj" />
|
||||
<ProjectReference Include="..\Connected.Security\Connected.Security.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Update="SR.resx">
|
||||
<Generator>ResXFileCodeGenerator</Generator>
|
||||
<LastGenOutput>SR.Designer.cs</LastGenOutput>
|
||||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Update="SR.Designer.cs">
|
||||
<DesignTime>True</DesignTime>
|
||||
<AutoGen>True</AutoGen>
|
||||
<DependentUpon>SR.resx</DependentUpon>
|
||||
</Compile>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Include="..\..\LICENSE">
|
||||
<Pack>True</Pack>
|
||||
<PackagePath>\</PackagePath>
|
||||
</None>
|
||||
<None Include="..\..\README.md">
|
||||
<Pack>True</Pack>
|
||||
<PackagePath>\</PackagePath>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Update="SR.resx">
|
||||
<Generator>ResXFileCodeGenerator</Generator>
|
||||
<LastGenOutput>SR.Designer.cs</LastGenOutput>
|
||||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Connected.Configuration\Connected.Configuration.csproj" />
|
||||
<ProjectReference Include="..\Connected.Hosting\Connected.Hosting.csproj" />
|
||||
<ProjectReference Include="..\Connected.Runtime\Connected.Runtime.csproj" />
|
||||
<ProjectReference Include="..\Connected.Security\Connected.Security.csproj" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
@ -4,32 +4,11 @@
|
||||
<TargetFramework>net7.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
|
||||
<Title>$(AssemblyName)</Title>
|
||||
<Authors>Tom PIT</Authors>
|
||||
<Copyright>2022 Tom PIT</Copyright>
|
||||
<PackageProjectUrl>https://git.tompit.com/Connected/Info</PackageProjectUrl>
|
||||
<PackageReadmeFile>README.md</PackageReadmeFile>
|
||||
<PackageTags>connected;platform;</PackageTags>
|
||||
<IncludeSymbols>True</IncludeSymbols>
|
||||
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
|
||||
<PackageLicenseFile>LICENSE</PackageLicenseFile>
|
||||
<PackageOutputPath>$(OutputPath)</PackageOutputPath>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Include="..\..\LICENSE">
|
||||
<Pack>True</Pack>
|
||||
<PackagePath>\</PackagePath>
|
||||
</None>
|
||||
<None Include="..\..\README.md">
|
||||
<Pack>True</Pack>
|
||||
<PackagePath>\</PackagePath>
|
||||
</None>
|
||||
<ProjectReference Include="..\Connected.Collections\Connected.Collections.csproj" />
|
||||
<ProjectReference Include="..\Connected.Net\Connected.Net.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Connected.Collections\Connected.Collections.csproj" />
|
||||
<ProjectReference Include="..\Connected.Net\Connected.Net.csproj" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
@ -5,22 +5,20 @@
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
<RootNamespace>$(MSBuildProjectName.Replace(" ", "_"))</RootNamespace>
|
||||
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
|
||||
<Title>$(AssemblyName)</Title>
|
||||
<Authors>Tom PIT</Authors>
|
||||
<Copyright>2022 Tom PIT</Copyright>
|
||||
<PackageProjectUrl>https://git.tompit.com/Connected/Info</PackageProjectUrl>
|
||||
<PackageReadmeFile>README.md</PackageReadmeFile>
|
||||
<PackageTags>connected;platform;</PackageTags>
|
||||
<IncludeSymbols>True</IncludeSymbols>
|
||||
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
|
||||
<PackageLicenseFile>LICENSE</PackageLicenseFile>
|
||||
<PackageOutputPath>$(OutputPath)</PackageOutputPath>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.*-*" />
|
||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.*-*" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0-rc.2.22472.3" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\..\Connected\src\Connected\Connected.csproj" />
|
||||
<ProjectReference Include="..\Connected.Configuration\Connected.Configuration.csproj" />
|
||||
<ProjectReference Include="..\Connected.Interop\Connected.Interop.csproj" />
|
||||
<ProjectReference Include="..\Connected.Net\Connected.Net.csproj" />
|
||||
<ProjectReference Include="..\Connected.Services\Connected.Services.csproj" />
|
||||
<ProjectReference Include="..\..\..\connected.framework\src\Connected.Runtime\Connected.Runtime.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
@ -38,21 +36,4 @@
|
||||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Include="..\..\LICENSE">
|
||||
<Pack>True</Pack>
|
||||
<PackagePath>\</PackagePath>
|
||||
</None>
|
||||
<None Include="..\..\README.md">
|
||||
<Pack>True</Pack>
|
||||
<PackagePath>\</PackagePath>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Connected.Configuration\Connected.Configuration.csproj" />
|
||||
<ProjectReference Include="..\Connected.Interop\Connected.Interop.csproj" />
|
||||
<ProjectReference Include="..\Connected.Net\Connected.Net.csproj" />
|
||||
<ProjectReference Include="..\Connected.Services\Connected.Services.csproj" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
@ -5,36 +5,15 @@
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
<RootNamespace>$(MSBuildProjectName.Replace(" ", "_"))</RootNamespace>
|
||||
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
|
||||
<Title>$(AssemblyName)</Title>
|
||||
<Authors>Tom PIT</Authors>
|
||||
<Copyright>2022 Tom PIT</Copyright>
|
||||
<PackageProjectUrl>https://git.tompit.com/Connected/Info</PackageProjectUrl>
|
||||
<PackageReadmeFile>README.md</PackageReadmeFile>
|
||||
<PackageTags>connected;platform;</PackageTags>
|
||||
<IncludeSymbols>True</IncludeSymbols>
|
||||
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
|
||||
<PackageLicenseFile>LICENSE</PackageLicenseFile>
|
||||
<PackageOutputPath>$(OutputPath)</PackageOutputPath>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.2.*-*" />
|
||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.*-*" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.App" Version="7.0.0-rc.2.22472.3" />
|
||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0-rc.2.22472.3" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Include="..\..\LICENSE">
|
||||
<Pack>True</Pack>
|
||||
<PackagePath>\</PackagePath>
|
||||
</None>
|
||||
<None Include="..\..\README.md">
|
||||
<Pack>True</Pack>
|
||||
<PackagePath>\</PackagePath>
|
||||
</None>
|
||||
<ProjectReference Include="..\..\..\Connected\src\Connected\Connected.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\dependencies\Connected\src\Connected\Connected.csproj" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
using Microsoft.AspNetCore.Builder;
|
||||
using Microsoft.Extensions.Configuration;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
|
||||
namespace Connected;
|
||||
@ -8,6 +7,6 @@ public interface IStartup
|
||||
{
|
||||
void ConfigureServices(IServiceCollection services);
|
||||
void Configure(WebApplication app);
|
||||
Task Initialize(IConfiguration config);
|
||||
Task Start(IConfiguration config);
|
||||
Task Initialize(Dictionary<string, string> args);
|
||||
Task Start(Dictionary<string, string> args);
|
||||
}
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
using Microsoft.AspNetCore.Builder;
|
||||
using Microsoft.Extensions.Configuration;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
|
||||
namespace Connected;
|
||||
@ -28,22 +27,22 @@ public abstract class Startup : IStartup
|
||||
|
||||
}
|
||||
|
||||
public async Task Initialize(IConfiguration config)
|
||||
public async Task Initialize(Dictionary<string, string> args)
|
||||
{
|
||||
await OnInitialize(config);
|
||||
await OnInitialize(args);
|
||||
}
|
||||
|
||||
protected virtual async Task OnInitialize(IConfiguration config)
|
||||
protected virtual async Task OnInitialize(Dictionary<string, string> args)
|
||||
{
|
||||
await Task.CompletedTask;
|
||||
}
|
||||
|
||||
public async Task Start(IConfiguration config)
|
||||
public async Task Start(Dictionary<string, string> args)
|
||||
{
|
||||
await OnStart(config);
|
||||
await OnStart(args);
|
||||
}
|
||||
|
||||
protected virtual async Task OnStart(IConfiguration config)
|
||||
protected virtual async Task OnStart(Dictionary<string, string> args)
|
||||
{
|
||||
await Task.CompletedTask;
|
||||
}
|
||||
|
||||
@ -1,26 +1,21 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net7.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
|
||||
<Title>$(AssemblyName)</Title>
|
||||
<Authors>Tom PIT</Authors>
|
||||
<Copyright>2022 Tom PIT</Copyright>
|
||||
<PackageProjectUrl>https://git.tompit.com/Connected/Info</PackageProjectUrl>
|
||||
<PackageReadmeFile>README.md</PackageReadmeFile>
|
||||
<PackageTags>connected;platform;</PackageTags>
|
||||
<IncludeSymbols>True</IncludeSymbols>
|
||||
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
|
||||
<PackageLicenseFile>LICENSE</PackageLicenseFile>
|
||||
<PackageOutputPath>$(OutputPath)</PackageOutputPath>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.25.0" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Connected.Interop\Connected.Interop.csproj" />
|
||||
<ProjectReference Include="..\Connected.Middleware\Connected.Middleware.csproj" />
|
||||
<ProjectReference Include="..\Connected.Threading\Connected.Threading.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Compile Update="SR.Designer.cs">
|
||||
<DesignTime>True</DesignTime>
|
||||
@ -36,20 +31,4 @@
|
||||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Include="..\..\LICENSE">
|
||||
<Pack>True</Pack>
|
||||
<PackagePath>\</PackagePath>
|
||||
</None>
|
||||
<None Include="..\..\README.md">
|
||||
<Pack>True</Pack>
|
||||
<PackagePath>\</PackagePath>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Connected.Interop\Connected.Interop.csproj" />
|
||||
<ProjectReference Include="..\Connected.Middleware\Connected.Middleware.csproj" />
|
||||
<ProjectReference Include="..\Connected.Threading\Connected.Threading.csproj" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
@ -1,58 +1,38 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net7.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
|
||||
<Title>$(AssemblyName)</Title>
|
||||
<Authors>Tom PIT</Authors>
|
||||
<Copyright>2022 Tom PIT</Copyright>
|
||||
<PackageProjectUrl>https://git.tompit.com/Connected/Info</PackageProjectUrl>
|
||||
<PackageReadmeFile>README.md</PackageReadmeFile>
|
||||
<PackageTags>connected;platform;</PackageTags>
|
||||
<IncludeSymbols>True</IncludeSymbols>
|
||||
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
|
||||
<PackageLicenseFile>LICENSE</PackageLicenseFile>
|
||||
<PackageOutputPath>$(OutputPath)</PackageOutputPath>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net7.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="System.Linq.Async" Version="6.0.*-*" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="System.Linq.Async" Version="6.0.1" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Compile Update="SR.Designer.cs">
|
||||
<DesignTime>True</DesignTime>
|
||||
<AutoGen>True</AutoGen>
|
||||
<DependentUpon>SR.resx</DependentUpon>
|
||||
</Compile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\..\Connected\src\Connected\Connected.csproj" />
|
||||
<ProjectReference Include="..\Connected.Caching\Connected.Caching.csproj" />
|
||||
<ProjectReference Include="..\Connected.Data\Connected.Data.csproj" />
|
||||
<ProjectReference Include="..\Connected.Security\Connected.Security.csproj" />
|
||||
<ProjectReference Include="..\Connected.Entities\Connected.Entities.csproj" />
|
||||
<ProjectReference Include="..\Connected.Notifications\Connected.Notifications.csproj" />
|
||||
<ProjectReference Include="..\Connected.Validation\Connected.Validation.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Update="SR.resx">
|
||||
<Generator>ResXFileCodeGenerator</Generator>
|
||||
<LastGenOutput>SR.Designer.cs</LastGenOutput>
|
||||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Update="SR.Designer.cs">
|
||||
<DesignTime>True</DesignTime>
|
||||
<AutoGen>True</AutoGen>
|
||||
<DependentUpon>SR.resx</DependentUpon>
|
||||
</Compile>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Include="..\..\LICENSE">
|
||||
<Pack>True</Pack>
|
||||
<PackagePath>\</PackagePath>
|
||||
</None>
|
||||
<None Include="..\..\README.md">
|
||||
<Pack>True</Pack>
|
||||
<PackagePath>\</PackagePath>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Update="SR.resx">
|
||||
<Generator>ResXFileCodeGenerator</Generator>
|
||||
<LastGenOutput>SR.Designer.cs</LastGenOutput>
|
||||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Connected.Caching\Connected.Caching.csproj" />
|
||||
<ProjectReference Include="..\Connected.Data\Connected.Data.csproj" />
|
||||
<ProjectReference Include="..\Connected.Entities\Connected.Entities.csproj" />
|
||||
<ProjectReference Include="..\Connected.Notifications\Connected.Notifications.csproj" />
|
||||
<ProjectReference Include="..\Connected.Security\Connected.Security.csproj" />
|
||||
<ProjectReference Include="..\Connected.Validation\Connected.Validation.csproj" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
@ -51,14 +51,4 @@ public static class ServicesExtensions
|
||||
return (f is not null && type.GetInterface(f) is not null)
|
||||
|| (nf is not null && type.GetInterface(nf) is not null);
|
||||
}
|
||||
|
||||
public static string AsUrlFriendly(this string value)
|
||||
{
|
||||
return UrlGenerator.Generate(value);
|
||||
}
|
||||
|
||||
public static string AsUrlFriendly(this string value, IEnumerable<string> existing)
|
||||
{
|
||||
return UrlGenerator.Generate(value, existing);
|
||||
}
|
||||
}
|
||||
@ -1,112 +0,0 @@
|
||||
using System.Text;
|
||||
|
||||
namespace Connected.Services;
|
||||
internal static class UrlGenerator
|
||||
{
|
||||
private const string ValidCharacters = "abcdefghijklmnopqrstuvzxyw-";
|
||||
private const string MinusReplacements = "_ .\t\r\n";
|
||||
static UrlGenerator()
|
||||
{
|
||||
Replacements = new(StringComparer.OrdinalIgnoreCase)
|
||||
{
|
||||
{"č", "c"},
|
||||
{"š", "s"},
|
||||
{"ž", "z"},
|
||||
{"đ", "d"},
|
||||
{"ć", "c"}
|
||||
};
|
||||
}
|
||||
|
||||
private static Dictionary<string, string> Replacements { get; }
|
||||
|
||||
public static string Generate(string text)
|
||||
{
|
||||
if (string.IsNullOrEmpty(text))
|
||||
throw new NullReferenceException(nameof(text));
|
||||
|
||||
var result = new StringBuilder();
|
||||
/*
|
||||
* Analyze each character.
|
||||
*/
|
||||
foreach (var s in text.Trim())
|
||||
{
|
||||
/*
|
||||
* If it's in a ValidCharacters collection that's fine, we just copy it
|
||||
* into the result.
|
||||
*/
|
||||
if (ValidCharacters.Contains(s, StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
result.Append(s);
|
||||
continue;
|
||||
}
|
||||
/*
|
||||
* Look if it's in the MinusReplacements collection which means we'll
|
||||
* replace the character with the minus sign.
|
||||
*/
|
||||
if (MinusReplacements.Contains(s, StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
result.Append('-');
|
||||
continue;
|
||||
}
|
||||
/*
|
||||
* Last chance for the character to be included in the result is to
|
||||
* resolve the hardcoded character replacements.
|
||||
*/
|
||||
if (Replacements.TryGetValue(s.ToString(), out var replacement))
|
||||
result.Append(replacement);
|
||||
}
|
||||
/*
|
||||
* It's possible that no characters are included in the result. If that's
|
||||
* the case we are going to include an a character just for the sake of
|
||||
* being a valid string.
|
||||
*/
|
||||
if (result.Length == 0)
|
||||
result.Append('a');
|
||||
/*
|
||||
* Remove any redundant minus characters and we are done.
|
||||
*/
|
||||
var sb = new StringBuilder();
|
||||
var active = false;
|
||||
|
||||
for (var i = 0; i < result.Length; i++)
|
||||
{
|
||||
if (result[i] == '-')
|
||||
{
|
||||
if (active)
|
||||
continue;
|
||||
|
||||
active = true;
|
||||
sb.Append(result[i]);
|
||||
}
|
||||
else
|
||||
{
|
||||
active = false;
|
||||
sb.Append(result[i]);
|
||||
}
|
||||
}
|
||||
/*
|
||||
* Remove trailing minus if exists.
|
||||
*/
|
||||
return sb.ToString().Trim().Trim('-').ToLowerInvariant();
|
||||
}
|
||||
|
||||
public static string Generate(string text, IEnumerable<string> existing)
|
||||
{
|
||||
var prepared = Generate(text);
|
||||
|
||||
if (!existing.Any())
|
||||
return prepared;
|
||||
|
||||
var idx = 0;
|
||||
|
||||
while (true)
|
||||
{
|
||||
var key = $"{prepared}-{idx}";
|
||||
|
||||
if (!existing.Contains(key, StringComparer.OrdinalIgnoreCase))
|
||||
return key;
|
||||
|
||||
idx++;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,49 +1,28 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net7.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
|
||||
<Title>$(AssemblyName)</Title>
|
||||
<Authors>Tom PIT</Authors>
|
||||
<Copyright>2022 Tom PIT</Copyright>
|
||||
<PackageProjectUrl>https://git.tompit.com/Connected/Info</PackageProjectUrl>
|
||||
<PackageReadmeFile>README.md</PackageReadmeFile>
|
||||
<PackageTags>connected;platform;</PackageTags>
|
||||
<IncludeSymbols>True</IncludeSymbols>
|
||||
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
|
||||
<PackageLicenseFile>LICENSE</PackageLicenseFile>
|
||||
<PackageOutputPath>$(OutputPath)</PackageOutputPath>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net7.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Compile Update="SR.Designer.cs">
|
||||
<DesignTime>True</DesignTime>
|
||||
<AutoGen>True</AutoGen>
|
||||
<DependentUpon>SR.resx</DependentUpon>
|
||||
</Compile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\..\Connected\src\Connected\Connected.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Update="SR.resx">
|
||||
<Generator>ResXFileCodeGenerator</Generator>
|
||||
<LastGenOutput>SR.Designer.cs</LastGenOutput>
|
||||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Update="SR.Designer.cs">
|
||||
<DesignTime>True</DesignTime>
|
||||
<AutoGen>True</AutoGen>
|
||||
<DependentUpon>SR.resx</DependentUpon>
|
||||
</Compile>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Update="SR.resx">
|
||||
<Generator>ResXFileCodeGenerator</Generator>
|
||||
<LastGenOutput>SR.Designer.cs</LastGenOutput>
|
||||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Include="..\..\LICENSE">
|
||||
<Pack>True</Pack>
|
||||
<PackagePath>\</PackagePath>
|
||||
</None>
|
||||
<None Include="..\..\README.md">
|
||||
<Pack>True</Pack>
|
||||
<PackagePath>\</PackagePath>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\dependencies\Connected\src\Connected\Connected.csproj" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
@ -1,50 +1,29 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net7.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
|
||||
<Title>$(AssemblyName)</Title>
|
||||
<Authors>Tom PIT</Authors>
|
||||
<Copyright>2022 Tom PIT</Copyright>
|
||||
<PackageProjectUrl>https://git.tompit.com/Connected/Info</PackageProjectUrl>
|
||||
<PackageReadmeFile>README.md</PackageReadmeFile>
|
||||
<PackageTags>connected;platform;</PackageTags>
|
||||
<IncludeSymbols>True</IncludeSymbols>
|
||||
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
|
||||
<PackageLicenseFile>LICENSE</PackageLicenseFile>
|
||||
<PackageOutputPath>$(OutputPath)</PackageOutputPath>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Compile Update="SR.Designer.cs">
|
||||
<DesignTime>True</DesignTime>
|
||||
<AutoGen>True</AutoGen>
|
||||
<DependentUpon>SR.resx</DependentUpon>
|
||||
</Compile>
|
||||
<ProjectReference Include="..\Connected.Runtime\Connected.Runtime.csproj" />
|
||||
<ProjectReference Include="..\Connected.Security\Connected.Security.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Update="SR.resx">
|
||||
<Generator>ResXFileCodeGenerator</Generator>
|
||||
<LastGenOutput>SR.Designer.cs</LastGenOutput>
|
||||
</EmbeddedResource>
|
||||
<Compile Update="SR.Designer.cs">
|
||||
<DesignTime>True</DesignTime>
|
||||
<AutoGen>True</AutoGen>
|
||||
<DependentUpon>SR.resx</DependentUpon>
|
||||
</Compile>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Include="..\..\LICENSE">
|
||||
<Pack>True</Pack>
|
||||
<PackagePath>\</PackagePath>
|
||||
</None>
|
||||
<None Include="..\..\README.md">
|
||||
<Pack>True</Pack>
|
||||
<PackagePath>\</PackagePath>
|
||||
</None>
|
||||
<EmbeddedResource Update="SR.resx">
|
||||
<Generator>ResXFileCodeGenerator</Generator>
|
||||
<LastGenOutput>SR.Designer.cs</LastGenOutput>
|
||||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Connected.Runtime\Connected.Runtime.csproj" />
|
||||
<ProjectReference Include="..\Connected.Security\Connected.Security.csproj" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user