Commit fc4d682
committed
Merge branch 'master' of https://github.com/EdCharlesDiesel/Orion.Microservices.NET
# Conflicts:
# src/API/Orion.API.Apps/obj/Debug/net9.0/Orion.API.Apps.AssemblyInfo.cs
# src/API/Orion.API.Apps/obj/Debug/net9.0/Orion.API.Apps.AssemblyInfoInputs.cache
# src/API/Orion.API.Apps/obj/Debug/net9.0/Orion.API.Apps.csproj.AssemblyReference.cache
# src/API/Orion.API.Apps/obj/rider.project.model.nuget.info
# src/API/Orion.API.BuildVersion/obj/Debug/net9.0/Orion.API.BuildVersion.AssemblyInfo.cs
# src/API/Orion.API.BuildVersion/obj/Debug/net9.0/Orion.API.BuildVersion.AssemblyInfoInputs.cache
# src/API/Orion.API.BuildVersion/obj/Debug/net9.0/Orion.API.BuildVersion.csproj.AssemblyReference.cache
# src/API/Orion.API.BuildVersion/obj/rider.project.model.nuget.info
# src/API/Orion.API.Dashboard/obj/Debug/net9.0/Orion.API.Dashboard.AssemblyInfo.cs
# src/API/Orion.API.Dashboard/obj/Debug/net9.0/Orion.API.Dashboard.AssemblyInfoInputs.cache
# src/API/Orion.API.Dashboard/obj/Debug/net9.0/Orion.API.Dashboard.csproj.AssemblyReference.cache
# src/API/Orion.API.Dashboard/obj/rider.project.model.nuget.info
# src/API/Orion.API.DatabaseLog/obj/Debug/net9.0/Orion.API.DatabaseLog.AssemblyInfo.cs
# src/API/Orion.API.DatabaseLog/obj/Debug/net9.0/Orion.API.DatabaseLog.AssemblyInfoInputs.cache
# src/API/Orion.API.DatabaseLog/obj/Debug/net9.0/Orion.API.DatabaseLog.csproj.AssemblyReference.cache
# src/API/Orion.API.DatabaseLog/obj/rider.project.model.nuget.info
# src/API/Orion.API.ErrorLog/obj/Debug/net9.0/Orion.API.ErrorLog.AssemblyInfo.cs
# src/API/Orion.API.ErrorLog/obj/Debug/net9.0/Orion.API.ErrorLog.AssemblyInfoInputs.cache
# src/API/Orion.API.ErrorLog/obj/Debug/net9.0/Orion.API.ErrorLog.csproj.AssemblyReference.cache
# src/API/Orion.API.ErrorLog/obj/rider.project.model.nuget.info
# src/API/Orion.API.HumanResources/obj/Debug/net9.0/Orion.API.HumanResources.AssemblyInfo.cs
# src/API/Orion.API.HumanResources/obj/Debug/net9.0/Orion.API.HumanResources.AssemblyInfoInputs.cache
# src/API/Orion.API.HumanResources/obj/Debug/net9.0/Orion.API.HumanResources.csproj.AssemblyReference.cache
# src/API/Orion.API.HumanResources/obj/rider.project.model.nuget.info
# src/API/Orion.API.Person/obj/Debug/net9.0/Orion.API.Person.AssemblyInfo.cs
# src/API/Orion.API.Person/obj/Debug/net9.0/Orion.API.Person.AssemblyInfoInputs.cache
# src/API/Orion.API.Person/obj/Debug/net9.0/Orion.API.Person.csproj.AssemblyReference.cache
# src/API/Orion.API.Person/obj/rider.project.model.nuget.info
# src/API/Orion.API.Production/obj/Debug/net9.0/Orion.API.Production.AssemblyInfo.cs
# src/API/Orion.API.Production/obj/Debug/net9.0/Orion.API.Production.AssemblyInfoInputs.cache
# src/API/Orion.API.Production/obj/Debug/net9.0/Orion.API.Production.csproj.AssemblyReference.cache
# src/API/Orion.API.Production/obj/rider.project.model.nuget.info
# src/API/Orion.API.Purchasing/obj/Debug/net9.0/Orion.API.Purchasing.AssemblyInfo.cs
# src/API/Orion.API.Purchasing/obj/Debug/net9.0/Orion.API.Purchasing.AssemblyInfoInputs.cache
# src/API/Orion.API.Purchasing/obj/Debug/net9.0/Orion.API.Purchasing.csproj.AssemblyReference.cache
# src/API/Orion.API.Purchasing/obj/rider.project.model.nuget.info
# src/API/Orion.API.Sales/obj/Debug/net9.0/Orion.API.Sales.AssemblyInfo.cs
# src/API/Orion.API.Sales/obj/Debug/net9.0/Orion.API.Sales.AssemblyInfoInputs.cache
# src/API/Orion.API.Sales/obj/Debug/net9.0/Orion.API.Sales.csproj.AssemblyReference.cache
# src/API/Orion.API.Sales/obj/rider.project.model.nuget.info
# src/API/Orion.API.TradingEconomics/obj/Debug/net9.0/Orion.API.TradingEconomics.AssemblyInfo.cs
# src/API/Orion.API.TradingEconomics/obj/Debug/net9.0/Orion.API.TradingEconomics.AssemblyInfoInputs.cache
# src/API/Orion.API.TradingEconomics/obj/Debug/net9.0/Orion.API.TradingEconomics.csproj.AssemblyReference.cache
# src/API/Orion.API.TradingEconomics/obj/rider.project.model.nuget.info
# src/API/Orion.API.UserProfileManagement/obj/Debug/net9.0/Orion.API.UserProfileManagement.AssemblyInfo.cs
# src/API/Orion.API.UserProfileManagement/obj/Debug/net9.0/Orion.API.UserProfileManagement.AssemblyInfoInputs.cache
# src/API/Orion.API.UserProfileManagement/obj/Debug/net9.0/Orion.API.UserProfileManagement.csproj.AssemblyReference.cache
# src/API/Orion.API.UserProfileManagement/obj/rider.project.model.nuget.info
# src/ApiGateways/External.PaymentGateway/obj/rider.project.model.nuget.info
# src/ApiGateways/OcelotApiGw/obj/rider.project.model.nuget.info
# src/ApiGateways/Shopping.Aggregator/obj/Debug/net9.0/Orion.Shopping.Aggregator.AssemblyInfo.cs
# src/ApiGateways/Shopping.Aggregator/obj/Debug/net9.0/Orion.Shopping.Aggregator.AssemblyInfoInputs.cache
# src/ApiGateways/Shopping.Aggregator/obj/Debug/net9.0/Orion.Shopping.Aggregator.csproj.AssemblyReference.cache
# src/ApiGateways/Shopping.Aggregator/obj/rider.project.model.nuget.info
# src/Applications/Orion.WebApps.HealthCheckUI/obj/rider.project.model.nuget.info
# src/Applications/Orion.WebApps.TradingEconomics/obj/rider.project.model.nuget.info
# src/DataAccess/Orion.DataAccess.Postgres/obj/Debug/net9.0/Orion.DataAccess.Postgres.AssemblyInfo.cs
# src/DataAccess/Orion.DataAccess.Postgres/obj/Debug/net9.0/Orion.DataAccess.Postgres.AssemblyInfoInputs.cache
# src/DataAccess/Orion.DataAccess.Postgres/obj/Debug/net9.0/Orion.DataAccess.Postgres.assets.cache
# src/DataAccess/Orion.DataAccess.Postgres/obj/Debug/net9.0/Orion.DataAccess.Postgres.csproj.AssemblyReference.cache
# src/DataAccess/Orion.DataAccess.Postgres/obj/rider.project.model.nuget.info
# src/Domain/Orion.Domain.UnitTests/obj/rider.project.model.nuget.info
# src/Domain/Orion.Domain/obj/Debug/net9.0/Orion.Domain.AssemblyInfo.cs
# src/Domain/Orion.Domain/obj/Debug/net9.0/Orion.Domain.AssemblyInfoInputs.cache
# src/Helpers/obj/rider.project.model.nuget.info
# src/Infrastructure/Common.Logging/obj/rider.project.model.nuget.info
# src/UnitTests/Orion.API.HR.UnitTests/obj/rider.project.model.nuget.info
# src/UnitTests/Orion.API.Person.UnitTests/obj/rider.project.model.nuget.info
# src/UnitTests/Orion.API.TradingEcomomics.UnitTests/obj/rider.project.model.nuget.info
# src/UnitTests/Orion.Helpers.UnitTests/obj/rider.project.model.nuget.infoFile tree
1,738 files changed
+74354
-46545
lines changed- .github/workflows
- src
- API
- Orion.API.Apps
- Properties
- bin/Debug/net9.0
- obj
- Debug/net9.0
- refint
- ref
- Orion.API.BuildVersion
- Properties
- bin/Debug/net9.0
- obj
- Debug/net9.0
- refint
- ref
- Orion.API.Dashboard
- Properties
- bin/Debug/net9.0
- obj
- Debug/net9.0
- refint
- ref
- Orion.API.DatabaseLog
- Properties
- bin/Debug/net9.0
- obj
- Debug/net9.0
- refint
- ref
- Orion.API.ErrorLog
- Properties
- bin/Debug/net9.0
- obj
- Debug/net9.0
- refint
- ref
- Orion.API.HumanResources
- Properties
- bin/Debug/net9.0
- logs
- obj
- Debug/net9.0
- refint
- ref
- Orion.API.Person
- Properties
- bin/Debug/net9.0
- obj
- Debug/net9.0
- refint
- ref
- Orion.API.Production
- Properties
- bin/Debug/net9.0
- obj
- Debug/net9.0
- refint
- ref
- Orion.API.Purchasing
- Properties
- bin/Debug/net9.0
- obj
- Debug/net9.0
- refint
- ref
- Orion.API.Sales
- Properties
- bin/Debug/net9.0
- obj
- Debug/net9.0
- refint
- ref
- Orion.API.TradingEconomics
- Properties
- bin/Debug/net9.0
- obj
- Debug/net9.0
- refint
- ref
- Orion.API.UserProfileManagement
- Controllers
- Properties
- bin/Debug/net9.0
- obj
- Debug/net9.0
- refint
- ref
- Orion.API.UserProfile
- ActionFilters
- Controllers
- DTO
- Mappings
- Models
- Properties
- bin
- Debug
- net6.0
- net9.0
- de
- es
- fr
- it
- ja
- ko
- pt-BR
- runtimes
- linux/lib/net9.0
- osx/lib/net9.0
- unix/lib/net6.0
- win-arm64/native
- win-arm/native
- win-x64/native
- win-x86/native
- win/lib
- net6.0
- net9.0
- ru
- zh-Hans
- zh-Hant
- Release/net9.0
- cs
- de
- es
- fr
- it
- ja
- ko
- pl
- pt-BR
- runtimes
- linux/lib/net9.0
- osx/lib/net9.0
- unix/lib/net6.0
- win-arm64/native
- win-arm/native
- win-x64/native
- win-x86/native
- win/lib
- net6.0
- net9.0
- ru
- tr
- zh-Hans
- zh-Hant
- obj
- Debug
- net6.0
- refint
- ref
- staticwebassets
- net9.0
- refint
- ref
- Release/net9.0
- refint
- ref
- ApiGateways
- External.PaymentGateway
- bin/Debug/net9.0
- obj
- Debug/net9.0
- refint
- ref
- OcelotApiGw/obj
- Debug/net9.0
- Shopping.Aggregator
- Controllers
- Extensions
- Models
- Services
- bin/Debug/net9.0
- obj
- Debug/net9.0
- refint
- ref
- Applications
- Orion.WebApps.HealthCheckUI/obj
- Debug/net9.0
- Orion.WebApps.TradingEconomics
- bin/Debug/net9.0
- obj
- Debug/net9.0
- refint
- ref
- DataAccess/Orion.DataAccess.Postgres
- Data
- Migrations
- Entities
- Tools
- bin/Debug/net9.0
- obj
- Debug/net9.0
- refint
- ref
- Domain
- Orion.Domain.UnitTests
- bin/Debug/net9.0
- obj
- Debug/net9.0
- refint
- ref
- Orion.Domain
- DTO
- bin/Debug/net9.0
- obj
- Debug/net9.0
- refint
- ref
- Helpers/obj
- Debug/net9.0
- Infrastructure
- Common.Logging/obj
- Debug/net9.0
- EventBus.Messages/obj
- Debug/net9.0
- Orion.Api
- Controllers
- Properties
- Repositories
- bin/Debug/net9.0
- obj
- Debug
- net6.0
- net9.0
- refint
- ref
- Orion.Idp
- Pages
- Account
- Login
- Logout
- Ciba
- Consent
- Device
- Diagnostics
- ExternalLogin
- Grants
- Home/Error
- Redirect
- ServerSideSessions
- Properties
- bin/Debug/net9.0
- keys
- keys
- obj
- Debug
- net6.0
- net9.0
- compressed
- refint
- ref
- wwwroot
- css
- js
- lib
- bootstrap4-glyphicons
- css
- fonts/glyphicons
- maps
- bootstrap
- dist
- css
- js
- jquery
- dist
- Orion
- ApiServices
- Controllers
- Properties
- Views
- Conference
- Proposal
- bin/Debug/net9.0
- obj
- Debug
- net6.0
- net9.0
- refint
- ref
- wwwroot/img
- UnitTests
- Orion.API.HR.UnitTests
- bin/Debug/net9.0
- obj
- Debug/net9.0
- refint
- ref
- Orion.API.Person.UnitTests
- bin/Debug/net9.0
- obj
- Debug/net9.0
- refint
- ref
- Orion.API.TradingEcomomics.UnitTests
- bin/Debug/net9.0
- obj
- Debug/net9.0
- refint
- ref
- Orion.Helpers.UnitTests/obj
- Debug/net9.0
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
1,738 files changed
+74354
-46545
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
23 | | - | |
| 23 | + | |
24 | 24 | | |
25 | 25 | | |
26 | | - | |
| 26 | + | |
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
| 2 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
16 | | - | |
| 16 | + | |
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
| |||
106 | 106 | | |
107 | 107 | | |
108 | 108 | | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
109 | 119 | | |
110 | 120 | | |
111 | 121 | | |
| |||
224 | 234 | | |
225 | 235 | | |
226 | 236 | | |
| 237 | + | |
| 238 | + | |
| 239 | + | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
| 248 | + | |
| 249 | + | |
| 250 | + | |
| 251 | + | |
| 252 | + | |
227 | 253 | | |
228 | 254 | | |
229 | 255 | | |
| |||
269 | 295 | | |
270 | 296 | | |
271 | 297 | | |
| 298 | + | |
| 299 | + | |
| 300 | + | |
| 301 | + | |
272 | 302 | | |
273 | 303 | | |
274 | 304 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
| 26 | + | |
26 | 27 | | |
27 | 28 | | |
28 | 29 | | |
| |||
41 | 42 | | |
42 | 43 | | |
43 | 44 | | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
44 | 51 | | |
45 | 52 | | |
46 | 53 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
8 | | - | |
| 8 | + | |
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
| |||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
0 commit comments