Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
241 commits
Select commit Hold shift + click to select a range
021a1ed
#us/136858 .net5--windows
AlexanderBudnik Apr 6, 2021
89c1e4b
fix tests
AlexanderBudnik Apr 7, 2021
d4f1ee9
calculator.orleans updated
AlexanderBudnik Apr 8, 2021
c4ad00f
upgrade to 5.0, pining removed
AlexanderBudnik Apr 18, 2021
7538cd8
fix tests
AlexanderBudnik Apr 19, 2021
9a4c51f
merge from dev
AlexanderBudnik Apr 19, 2021
9839a6f
bump service contract version
AlexanderBudnik Apr 19, 2021
f4a02e6
rollback newtonsoft version
AlexanderBudnik Apr 19, 2021
e75d754
calculator project updated
AlexanderBudnik Apr 19, 2021
3899cbc
fix catch exception
AlexanderBudnik Apr 19, 2021
8e7e864
bump version of contracts
AlexanderBudnik Apr 21, 2021
5bcde10
change paket version
AlexanderBudnik Apr 21, 2021
43f40c3
fix paket version
AlexanderBudnik Apr 21, 2021
db329fe
paket version changed
AlexanderBudnik Apr 21, 2021
20a02e1
merge from dev
AlexanderBudnik Apr 25, 2021
19f166b
remove core test from net5
AlexanderBudnik Apr 25, 2021
ac2744c
fix parallel scope in testing
AlexanderBudnik Apr 25, 2021
ea7071f
change ParallelScope in tests
AlexanderBudnik Apr 25, 2021
6aaaffc
transition to nuget
AlexanderBudnik Apr 25, 2021
94a9cdd
ServiceContract version updated
AlexanderBudnik Apr 26, 2021
7a13cd6
Merge branch 'US/136585_Net5' into US/136585_Net5_Nuget
AlexanderBudnik Apr 26, 2021
ee67213
project changed to nuget
AlexanderBudnik Apr 27, 2021
77c3753
convert solution to nuget
AlexanderBudnik Apr 27, 2021
fc44814
fix dependencies
AlexanderBudnik Apr 27, 2021
be4d5de
fix nuget packages place
AlexanderBudnik Apr 28, 2021
3b98c80
update version to set VersionSuffix
AlexanderBudnik Apr 28, 2021
7b7658d
remove restore from lock file
AlexanderBudnik Apr 29, 2021
95ffb12
remove all packages.lock.json
AlexanderBudnik Apr 29, 2021
07f1dbd
first drop . move to clean net5
AlexanderBudnik Jun 17, 2021
d72c327
changed named semathore to named mutex
AlexanderBudnik Jun 17, 2021
dd76e03
implement metrics moc
AlexanderBudnik Jun 23, 2021
50314ed
first performance counters added
AlexanderBudnik Jun 29, 2021
2dca811
add few more counters
AlexanderBudnik Jun 29, 2021
325a795
fix test
AlexanderBudnik Jun 30, 2021
3b18de1
few small changes, fix tests
AlexanderBudnik Jul 12, 2021
98df15a
fix .net5 tests
AlexanderBudnik Jul 15, 2021
b109f45
rollback newtonsoft to 12
AlexanderBudnik Jul 29, 2021
76c2c56
tests fixes
AlexanderBudnik Aug 1, 2021
1dc3b6a
small fix(retry)
AlexanderBudnik Aug 3, 2021
c67ab7d
fix test
AlexanderBudnik Aug 4, 2021
6175161
fix test
AlexanderBudnik Aug 4, 2021
1de325a
set volatile to latest member in ConfigObject Creator
AlexanderBudnik Aug 4, 2021
3f8b305
remove test parallization
AlexanderBudnik Aug 4, 2021
bdb403d
fix test
AlexanderBudnik Aug 4, 2021
b341235
fix test
AlexanderBudnik Aug 5, 2021
edba185
fix test
AlexanderBudnik Aug 5, 2021
3d7fb32
remove parallezation from tests
AlexanderBudnik Aug 5, 2021
c54eab5
remove Parallelizable from tests
AlexanderBudnik Aug 5, 2021
d97e9db
fix tests
AlexanderBudnik Aug 5, 2021
08af24a
remove test parallization
AlexanderBudnik Aug 5, 2021
8a9bdd0
fixing ConsulDiscoveryMasterFallBackTest tests
Aug 5, 2021
0ca7860
Merge pull request #423 from maximburyak/US/134883_Implement_AppMetrics
AlexanderBudnik Aug 5, 2021
f497a7b
added printf debugging
Aug 5, 2021
78c7466
Merge pull request #424 from maximburyak/US/134883_Implement_AppMetrics
AlexanderBudnik Aug 5, 2021
cfaa7d9
remove servicecontacts from solution
AlexanderBudnik Aug 5, 2021
5f68dfb
fixing test
Aug 5, 2021
b14f130
Merge branch 'US/134883_Implement_AppMetrics' of https://github.com/g…
Aug 5, 2021
e81c892
Merge pull request #425 from maximburyak/US/134883_Implement_AppMetrics
AlexanderBudnik Aug 5, 2021
c59fc16
Merge branch 'US/134883_Implement_AppMetrics' of github.com:gigya/mic…
AlexanderBudnik Aug 5, 2021
a57ff3b
remove loop test
AlexanderBudnik Aug 5, 2021
a47a72e
fix tests
AlexanderBudnik Aug 5, 2021
8bac3dd
temporary mark HostTests.HostShouldStartAndStopMultipleTimes test
AlexanderBudnik Aug 5, 2021
13fb27b
add delay to HealthCheck_ServiceDrain_StatueShouldBe521
AlexanderBudnik Aug 6, 2021
b8218e1
temparary mark InstanceReadyBeforeCallingMethod_Warmup
AlexanderBudnik Aug 6, 2021
a6b5e0a
remove flaky tests
AlexanderBudnik Aug 6, 2021
464f3a8
remove HealthCheckTests (flaky)
AlexanderBudnik Aug 6, 2021
1b1311b
mark InstanceReadyBeforeCallingMethod_Warmup test (flaky)
AlexanderBudnik Aug 6, 2021
0900fd7
wrap all Dispose of orleans ServiceTester in try/catch to suppres tes…
AlexanderBudnik Aug 8, 2021
ce52af0
tests: improve test investigation logs and increase config change tim…
Aug 8, 2021
71b8ec3
Merge pull request #426 from maximburyak/US/134883_Implement_AppMetrics
AlexanderBudnik Aug 8, 2021
7383e90
added asyc wait for ServiceDiscovery init task
Aug 8, 2021
c21fdfb
Merge pull request #427 from maximburyak/US/134883_Implement_AppMetrics
AlexanderBudnik Aug 8, 2021
b62fd9a
add await to all async calls
AlexanderBudnik Aug 8, 2021
1dc02c4
added counters output to test
Aug 8, 2021
f6c52e5
Merge pull request #428 from maximburyak/US/134883_Implement_AppMetrics
AlexanderBudnik Aug 8, 2021
4d5d1d0
added delay to ServiceProxyTests/BehaviorTests, until reachability is…
Aug 8, 2021
b1f631a
Merge pull request #429 from maximburyak/US/134883_Implement_AppMetrics
AlexanderBudnik Aug 8, 2021
fb930d4
replacing obsolete ShouldThrow with our own safe wait on throw
Aug 8, 2021
0acee7b
Merge pull request #430 from maximburyak/US/134883_Implement_AppMetrics
AlexanderBudnik Aug 8, 2021
0a5e65f
improving serviceName readability
Aug 8, 2021
c7f6170
Merge pull request #431 from maximburyak/US/134883_Implement_AppMetrics
AlexanderBudnik Aug 8, 2021
fce567d
increase delay
AlexanderBudnik Aug 8, 2021
5fbace4
fix consult related tests
Aug 10, 2021
706ebf1
increased wait time for test
Aug 10, 2021
8da17e1
switched to round robin
Aug 11, 2021
28183a1
fix async
AlexanderBudnik Aug 12, 2021
d0215f6
fixing CachingProxyTests timing issue
Aug 12, 2021
a143acd
fix GetNextHost_HostsThatChange_ReturnsNewHosts test
AlexanderBudnik Aug 12, 2021
543eb6a
setting roundrobin to difault routing strategy for tests in class
Aug 12, 2021
654bbeb
small fix
AlexanderBudnik Aug 12, 2021
7082ddd
Added linux cpu metrix
DenisDolgunovSap Aug 16, 2021
5309ebd
Created basic CPU metric for linux
DenisDolgunovSap Aug 16, 2021
32bc88e
Fix XPU metrics
AlexanderBudnik Aug 19, 2021
77ebb67
transform solution to centralized nuget
AlexanderBudnik Aug 21, 2021
e427eec
update projects to nuget
AlexanderBudnik Aug 22, 2021
753dc75
fix references
AlexanderBudnik Aug 22, 2021
758ba07
remove unnecessary nugets
AlexanderBudnik Aug 22, 2021
f61ca8c
add package lock
AlexanderBudnik Aug 22, 2021
87ee9e4
remove AspNetCore nugets
AlexanderBudnik Aug 22, 2021
3712233
last fix
AlexanderBudnik Aug 22, 2021
35c3630
resolve merge nugetMicro with oldNet5
Aug 22, 2021
ca5f60b
#000000: fix compilation and add packages.lock.json
Aug 22, 2021
8da459d
#000000: move to net5 pure (leaving metrics as netstand2.0 - need to …
Aug 22, 2021
7c31bfd
#000000: move to net5 pure (leaving metrics as netstand2.0 - need to …
Aug 22, 2021
9a848c9
remove warnings
AlexanderBudnik Aug 22, 2021
da17652
set RestorePackagesWithLockFile to false for CICD (temporary solution)
AlexanderBudnik Aug 22, 2021
09d8293
delete all packages.lock.json files
AlexanderBudnik Aug 22, 2021
3eee928
fix nugets generation
AlexanderBudnik Aug 22, 2021
9c21a5f
fix nuget versions (pin to higher ver)
AlexanderBudnik Aug 22, 2021
df79ac6
add docker declaration to proj
AlexanderBudnik Aug 22, 2021
85b8810
remove junk code
AlexanderBudnik Aug 23, 2021
eb15750
add nowarn
AlexanderBudnik Aug 23, 2021
c7510bf
upgrade to netstandard2.1
AlexanderBudnik Aug 23, 2021
4f50728
props changes
AlexanderBudnik Aug 23, 2021
509d418
restore from locked temparary removed
AlexanderBudnik Aug 23, 2021
b7f4162
remove unneded nugets. fix projects
AlexanderBudnik Aug 23, 2021
bf8dc4c
us/000000 project format updated
AlexanderBudnik Aug 24, 2021
f30ed3a
#000000 change project structure
AlexanderBudnik Aug 24, 2021
7e07e0f
us/#148158: Allow transforming Schema TypeNames using the net5-net4 b…
Aug 24, 2021
2668f79
Merge pull request #433 from gigya/us_148158_add_json_serialization_b…
aviviadi Aug 24, 2021
bd99558
#000000 change tests
AlexanderBudnik Aug 25, 2021
43b5462
#000000 remove warnings
AlexanderBudnik Aug 25, 2021
8f8dad1
#000000 move to pure net5.0
AlexanderBudnik Aug 26, 2021
85eeb96
us/000000: update lock file (common.test 4.0.1)
Aug 29, 2021
9dedfdb
set version to 4.0.0
AlexanderBudnik Aug 29, 2021
06345a1
set version to 4.0.0
AlexanderBudnik Aug 29, 2021
32e877c
us/#000000 Merge develop to main
AlexanderBudnik Sep 19, 2021
9387f1d
us/#000000 nugets updated
AlexanderBudnik Sep 19, 2021
66e26d9
Merge pull request #441 from gigya/develop
AlexanderBudnik Oct 6, 2021
8fd2a74
#000000 update nugets. clean dependencies. WIP
AlexanderBudnik Oct 6, 2021
2de5db6
#000000 fix test progects
AlexanderBudnik Oct 6, 2021
2940d34
#000000 update nugets
AlexanderBudnik Oct 10, 2021
2a5f196
us_152400: microservices status requests should support post
Oct 13, 2021
ae7ce71
us_152400: version bump
Oct 13, 2021
09a4452
us/#135869: fixing tests
Oct 13, 2021
e989162
us_152400: Code review fixes: test status endpint by full equality ra…
Oct 14, 2021
f700a98
Merge pull request #446 from gigya/us_152400_microservices_status_req…
maximburyak Oct 14, 2021
4a1a63a
#000000 global.json added
AlexanderBudnik Oct 17, 2021
c076c2d
#000000 remove warnings
AlexanderBudnik Oct 17, 2021
98890bb
#153654 Implement one workload metric for all platforms
AlexanderBudnik Oct 20, 2021
a5b9625
#153654 Fix tests
AlexanderBudnik Oct 22, 2021
957369e
Merge pull request #448 from gigya/#153654_Change_Metrics
AlexanderBudnik Oct 23, 2021
6014e86
#153654 missing metrics added
AlexanderBudnik Oct 31, 2021
7cc462f
#153654 missing metrics added
AlexanderBudnik Oct 31, 2021
c755d22
#153654 update 3rd party nugets
AlexanderBudnik Oct 31, 2021
9b205e4
#154681 create configuration for ThreadPool
AlexanderBudnik Nov 2, 2021
bf5d2fa
ServiceContract 4.0.1
samisil Nov 8, 2021
15d92fe
Dev to Main (#450)
samisil Nov 8, 2021
d6d239e
Metrics new name
samisil Nov 8, 2021
44d2ed1
Merge branch 'main' into dev
samisil Nov 8, 2021
ce847a4
Version 4.0.0 for gigya nuget server
samisil Nov 9, 2021
fb7aa74
none
samisil Nov 9, 2021
1c4959f
4.0.0
samisil Nov 9, 2021
c1412a0
version pumped. Matrics nuget changed his name to Gigya.Metrics
AlexanderBudnik Nov 10, 2021
4ea3865
Merge pull request #454 from gigya/dev
AlexanderBudnik Nov 10, 2021
dd13973
new Gigya.ServiceContract
samisil Nov 18, 2021
077ac20
new Gigya.ServiceContract (#455)
samisil Nov 18, 2021
8154e48
#156568 convert to netstandard/net6
AlexanderBudnik Nov 30, 2021
28a750c
#156568 clean nugets
AlexanderBudnik Nov 30, 2021
982cdc1
#156568 fix cross platform code
AlexanderBudnik Dec 1, 2021
9235e95
#156568 fix tests
AlexanderBudnik Dec 2, 2021
6960f61
#156568 fix WS issue
AlexanderBudnik Dec 7, 2021
53dfaca
#156568 "Microsoft.AspNetCore.Hosting" pinned for netstandard
AlexanderBudnik Dec 7, 2021
9979c53
#156568 add pining to fix WS issues
AlexanderBudnik Dec 8, 2021
1ef9708
us_158590 allow configuring certificate related error substrings, for…
Dec 21, 2021
2b19ddf
us_158590: Add GC collection endpoint
Dec 27, 2021
54702ad
us_158590: bumping version
Dec 27, 2021
c1bada5
us_158590: add CertificateErrorMessageSubstrings default value and mo…
Dec 28, 2021
6649245
us_158590: code review fixes
Dec 28, 2021
38b1574
#156568 fix ws issues. clean usings. remove unneeded nugets
AlexanderBudnik Dec 29, 2021
e5b68b5
Merge pull request #457 from gigya/us/#156568_Fix_WS_Issues
AlexanderBudnik Dec 30, 2021
ffce29b
#156568 pump version
AlexanderBudnik Jan 2, 2022
ff53f3d
Merge pull request #458 from gigya/us/#156568_Fix_WS_Issues
AlexanderBudnik Jan 2, 2022
955881b
us_15890: Added a token authorization step to the gc process
Jan 3, 2022
abef6a6
us_158590: Second gc endpoint code review changes
Jan 4, 2022
d7356a5
Merge pull request #456 from gigya/us_158590_net5_allow_configuring_c…
maximburyak Jan 4, 2022
56a7551
Merge branch 'main' into dev
maximburyak Jan 4, 2022
db0e450
Merge pull request #459 from gigya/dev
maximburyak Jan 4, 2022
84505e7
#156568 merge from dev
AlexanderBudnik Jan 9, 2022
b71f3d9
#156568 fix warning in test
AlexanderBudnik Jan 9, 2022
f38aa8c
#156568 pump version
AlexanderBudnik Jan 19, 2022
46a6dec
Merge pull request #460 from gigya/us/#156568_Net6_POC
AlexanderBudnik Jan 20, 2022
20601f7
Merge pull request #461 from gigya/dev
AlexanderBudnik Jan 20, 2022
132903e
Us/#162120 add http connection metrics (#464)
AlexanderBudnik Feb 5, 2022
7551ae2
Us/#162120 add http connection metrics (#465)
AlexanderBudnik Feb 7, 2022
d2af4a2
Dev (#466)
AlexanderBudnik Feb 7, 2022
425a9fc
#161748 RandomByRequestID to use determenistic hashcode
GuyRozenblat Feb 7, 2022
916c607
zookeeper custom ip
samisil Feb 8, 2022
ad0358c
fix
samisil Feb 8, 2022
f2c444b
Merge branch 'dev' into us/162663_zookeeper_custom_ip
AlexanderBudnik Feb 9, 2022
5c06a10
Merge pull request #468 from gigya/us/162663_zookeeper_custom_ip
AlexanderBudnik Feb 9, 2022
a64a76e
#162717 update nugets
AlexanderBudnik Feb 9, 2022
45a5e21
#162717 dotnet sdk version updated
AlexanderBudnik Feb 9, 2022
bc7074f
Merge branch 'main' into dev
AlexanderBudnik Feb 9, 2022
c371081
fix advertisedIP null
samisil Feb 10, 2022
af1666e
Merge branch 'us/162663_zookeeper_custom_ip' of https://github.com/gi…
samisil Feb 10, 2022
605a7cf
bump version
samisil Feb 10, 2022
8033698
Merge branch 'dev' into us/162663_zookeeper_custom_ip
samisil Feb 10, 2022
034ec54
fix HostIPAddress env
samisil Feb 10, 2022
5269e7d
#00000 listenOnAnyHostAddress
samisil Feb 10, 2022
15c91d0
Adding env containerParentName
samisil Feb 13, 2022
aab016a
Adding LinuxCertificateLoader
samisil Feb 13, 2022
6d9e8e2
snupkg
samisil Feb 13, 2022
1cef22e
bind ICertificateLocator
samisil Feb 14, 2022
b651d32
no snupkg for now
samisil Feb 14, 2022
f7c3253
kibana logs
samisil Feb 14, 2022
b801f7c
Merge pull request #473 from gigya/us/162663_zookeeper_custom_ip
AlexanderBudnik Feb 14, 2022
6285f62
ContainerName ServiceId DeployId
samisil Feb 20, 2022
298160b
Merge pull request #476 from gigya/us/162663_zookeeper_custom_ip
AlexanderBudnik Feb 21, 2022
b5fbadd
print envs (#477)
samisil Feb 22, 2022
0d34dd3
us_152400: improve logs for 'Only POST calls are allowed' errors
Feb 22, 2022
e0bc628
Merge pull request #478 from gigya/us_152400_improve_logs_for_only_po…
maximburyak Feb 22, 2022
d6627bc
ICertificateLocator bind
samisil Feb 27, 2022
d06c09b
bump version
samisil Feb 27, 2022
cb37846
ICertificateLocator if/else
samisil Mar 3, 2022
1d6afb3
ICertificateLocator
samisil Mar 9, 2022
6753470
ICertificateLocator exclusion list
samisil Mar 9, 2022
7dbdf04
ICertificateLocator exclusion list 2
samisil Mar 9, 2022
dda35e1
fix location ICertificateLocator
samisil Mar 9, 2022
2c7f95a
#165443 update nugets. split newtonsoft per framework
AlexanderBudnik Mar 17, 2022
ee6eae6
Merge branch 'dev' into us/164013_ICertificateLocator_bind
AlexanderBudnik Mar 20, 2022
f1235ea
Merge pull request #480 from gigya/us/164013_ICertificateLocator_bind
AlexanderBudnik Mar 20, 2022
f20d15c
#165443 rollback orleans version to 3.5.1 for not .net 6 framework
AlexanderBudnik Mar 20, 2022
a6b30d8
#165443 ping orleans nugets to tha same version
AlexanderBudnik Mar 21, 2022
f7cb0f6
#165443 net472 tests added.
AlexanderBudnik Mar 21, 2022
cf65785
#165443 metrics tests removed from net framework
AlexanderBudnik Mar 21, 2022
4648de0
Merge pull request #482 from gigya/us/165443_Fix_Test_In_Net472
AlexanderBudnik Mar 21, 2022
8549928
#165441 split metrics per framework
AlexanderBudnik Mar 22, 2022
b06675b
#165441 align .net 472 counter names
AlexanderBudnik Mar 22, 2022
dc4b12d
Merge pull request #484 from gigya/us/#165441_Split_Metrics_Per_OS
AlexanderBudnik Mar 22, 2022
d1463bd
#165441 pump version
AlexanderBudnik Mar 22, 2022
818236f
us_166120: modify ServiceProxyProvider.RunHttpsAvailabilityTest log l…
Mar 24, 2022
a66f0b8
Merge pull request #486 from gigya/us_166120_modify_ServiceProxyProvi…
maximburyak Mar 24, 2022
861bf39
Create Jenkinsfile
GigyaRnDDevOps Mar 24, 2022
392a9d0
Update Jenkinsfile
GigyaRnDDevOps Mar 27, 2022
a8963a0
Update Jenkinsfile
GigyaRnDDevOps Mar 27, 2022
2e40dcc
Update Jenkinsfile
GigyaRnDDevOps Mar 28, 2022
939acb8
Update Jenkinsfile
GigyaRnDDevOps Mar 28, 2022
e522c7f
Update Directory.Build.props
GigyaRnDDevOps Mar 28, 2022
326fdfe
Update Jenkinsfile
GigyaRnDDevOps Mar 28, 2022
480fdee
Update Jenkinsfile
GigyaRnDDevOps Mar 28, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
12 changes: 0 additions & 12 deletions .config/dotnet-tools.json

This file was deleted.

25 changes: 25 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
**/.classpath
**/.dockerignore
**/.env
**/.git
**/.gitignore
**/.project
**/.settings
**/.toolstarget
**/.vs
**/.vscode
**/*.*proj.user
**/*.dbmdl
**/*.jfm
**/azds.yaml
**/bin
**/charts
**/docker-compose*
**/Dockerfile*
**/node_modules
**/npm-debug.log
**/obj
**/secrets.dev.yaml
**/values.dev.yaml
LICENSE
README.md
23 changes: 23 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
[*.cs]
# CS0618: Type or member is obsolete
dotnet_diagnostic.CS0618.severity = none
# VSTHRD200: Use "Async" suffix for async methods
dotnet_diagnostic.VSTHRD200.severity = none
# SYSLIB0011: Type or member is obsolete
dotnet_diagnostic.SYSLIB0011.severity = none
# CS0168: Variable is declared but never used
dotnet_diagnostic.CS0168.severity = none
# CA1416: Validate platform compatibility
dotnet_diagnostic.CA1416.severity = error


# CS4014: Because this call is not awaited, execution of the current method continues before the call is completed. Consider applying the 'await' operator to the result of the call.
dotnet_diagnostic.CS4014.severity = none
# CS0169: The field is never used
dotnet_diagnostic.CS0169.severity = none
# CS0414: The field is assigned but its value is never used
dotnet_diagnostic.CS0414.severity = none
# CS0219: The variable is assigned but its value is never used
dotnet_diagnostic.CS0219.severity = none
# CS0649: Field is never assigned to, and will always have its default value
dotnet_diagnostic.CS0649.severity = none
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ bld/
# MSTest test Results
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*
testlogs/

# NUNIT
*.VisualState.xml
Expand Down Expand Up @@ -258,4 +259,7 @@ OrleansAdoNetContent/


/.paket/
launchSettings.json
/testlogs/
/CustomEvent
/output*
/whitesource
47 changes: 38 additions & 9 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,11 +1,40 @@
<Project>
<PropertyGroup>
<Company>Gigya Inc.</Company>
<Copyright>© 2020 Gigya Inc.</Copyright>
<Product>Microdot Framework</Product>
<Description>Microdot Framework</Description>
<AssemblyVersion></AssemblyVersion>
<Version>3.3.23</Version>
<RunSettingsFilePath>$(SolutionDir)\test.runsettings</RunSettingsFilePath>
</PropertyGroup>
<PropertyGroup>
<Company>Gigya Inc.</Company>
<Copyright>© 2021 Gigya Inc.</Copyright>
<Product>Microdot Framework</Product>
<Description>Microdot Framework</Description>
<RepositoryUrl>https://github.com/gigya/microdot</RepositoryUrl>
<PackageProjectUrl>https://github.com/gigya/microdot/blob/master/LICENSE.md</PackageProjectUrl>
<PackageTags>gigya microdot microservice microservices</PackageTags>
<VersionPrefix>4.1.9</VersionPrefix>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<!--<SymbolPackageFormat>snupkg</SymbolPackageFormat>-->
</PropertyGroup>
<PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1;net5.0;net6.0</TargetFrameworks>
<RuntimeIdentifiers>win10-x64;linux-x64</RuntimeIdentifiers>
<LangVersion>latest</LangVersion>
<IncludeSymbols>true</IncludeSymbols>
<OutputType>Library</OutputType>
<IsPublishable>false</IsPublishable>
<OutputPath>bin\$(Configuration)</OutputPath>
<RunSettingsFilePath>$(SolutionDir)test.runsettings</RunSettingsFilePath>
<CodeAnalysisRuleSet>$(SolutionDir)main.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<Target Name="SignDlls"
AfterTargets="AfterBuild"
Condition="'$(teamcity_server_url)'!='' And Exists('$(OutputPath)$(AssemblyName).dll') And $(GeneratePackageOnBuild) == true" >
<Exec Command="$(full_command_to_sign) $(OutputPath)$(AssemblyName).dll" />
</Target>
<Target Name="CopyPackage" AfterTargets="Pack">
<Copy SourceFiles="$(OutputPath)$(PackageId).$(PackageVersion).nupkg" DestinationFolder="$(SolutionDir)nugetPackages" />
<Copy SourceFiles="$(OutputPath)$(PackageId).$(PackageVersion).symbols.nupkg" DestinationFolder="$(SolutionDir)symbolPackages" />
</Target>
<PropertyGroup Label="GC configuration for service">
<ServerGarbageCollection>true</ServerGarbageCollection>
<ConcurrentGarbageCollection>true</ConcurrentGarbageCollection>
<RetainVMGarbageCollection>true</RetainVMGarbageCollection>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
</PropertyGroup>
</Project>
63 changes: 63 additions & 0 deletions Directory.Build.targets
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
<Project>
<PropertyGroup>
<Orleans_Version>3.5.1</Orleans_Version>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'net6.0'">
<Orleans_Version>3.6.0</Orleans_Version>
</PropertyGroup>

<ItemGroup Label="Gigya">
<PackageReference Update="Gigya.ServiceContract" Version="4.0.4"/>
</ItemGroup>

<ItemGroup Label="Orleans">
<PackageReference Update="Microsoft.Orleans.CodeGenerator.MSBuild" Version="$(Orleans_Version)"/>
<PackageReference Update="Microsoft.Orleans.OrleansRuntime" Version="$(Orleans_Version)"/>
<PackageReference Update="Microsoft.Orleans.Connections.Security" Version="$(Orleans_Version)"/>
<PackageReference Update="Microsoft.Orleans.OrleansZooKeeperUtils" Version="$(Orleans_Version)"/>
<PackageReference Update="Microsoft.Orleans.OrleansTelemetryConsumers.Counters" Version="$(Orleans_Version)"/>
<PackageReference Update="Microsoft.Orleans.Clustering.AdoNet" Version="$(Orleans_Version)"/>
<PackageReference Update="Microsoft.Orleans.OrleansProviders" Version="$(Orleans_Version)"/>
<PackageReference Update="Microsoft.Orleans.Persistence.AdoNet" Version="$(Orleans_Version)"/>
<PackageReference Update="Microsoft.Orleans.Reminders.AdoNet" Version="$(Orleans_Version)"/>
<PackageReference Update="Microsoft.Orleans.OrleansSqlUtils" Version="2.4.5"/>
</ItemGroup>

<ItemGroup Label="External_Libraries">
<PackageReference Update="Newtonsoft.Json" Version="13.0.1"/>
<PackageReference Update="Nito.AsyncEx" Version="5.1.2"/>
<PackageReference Update="Ninject.Extensions.Conventions" Version="3.3.0"/>
<PackageReference Update="Ninject.Extensions.Factory" Version="3.3.3"/>
<PackageReference Update="NLog" Version="4.7.14"/>
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'netstandard2.1'">
<PackageReference Update="Newtonsoft.Json" Version="12.0.3"/>
</ItemGroup>
<ItemGroup Label="Test">
<PackageReference Update="NSubstitute" Version="4.3.0"/>
<PackageReference Update="Shouldly" Version="4.0.3"/>
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.1.0"/>
<PackageReference Update="NUnit" Version="3.13.3"/>
<PackageReference Update="NUnit3TestAdapter" Version="4.2.1" NoWarn="NU1701"/>
<PackageReference Update="FluentAssertions" Version="6.5.1"/>
<PackageReference Update="RichardSzalay.MockHttp" Version="6.0.0"/>
</ItemGroup>

<ItemGroup Label="System">
<PackageReference Update="System.Configuration.ConfigurationManager" Version="6.0.0"/>
<PackageReference Update="System.Diagnostics.PerformanceCounter" Version="6.0.0"/>
<PackageReference Update="System.Runtime.Caching" Version="6.0.0"/>
<PackageReference Update="System.Threading.Tasks.Dataflow" Version="6.0.0" />
<PackageReference Update="System.ComponentModel.Annotations" Version="5.0.0" />
<PackageReference Update="System.Collections.Immutable" Version="6.0.0" />
<PackageReference Update="System.Reflection.DispatchProxy" Version="4.7.1" />
<PackageReference Update="Microsoft.CSharp" Version="4.7.0" />
</ItemGroup>

<ItemGroup Label="WS issues">
<PackageReference Update="System.Text.Encodings.Web" Version="6.0.0"/>
<PackageReference Update="System.Text.RegularExpressions" Version="4.3.1" />
<PackageReference Update="System.Net.Http" Version="4.3.4" />
</ItemGroup>

</Project>
21 changes: 17 additions & 4 deletions Gigya.Microdot.Common.Tests/DummyCertificateLocator.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System;
using Gigya.Microdot.SharedLogic.HttpService;
using System;
using System.Security.Cryptography;
using System.Security.Cryptography.X509Certificates;
using Gigya.Microdot.SharedLogic.HttpService;

namespace Gigya.Microdot.Common.Tests
{
Expand All @@ -10,8 +10,21 @@ public class DummyCertificateLocator : ICertificateLocator
public X509Certificate2 GetCertificate(string certName)
{
var ecdsa = ECDsa.Create(); // generate asymmetric key pair
var req = new CertificateRequest("cn=foobar", ecdsa, HashAlgorithmName.SHA256);
return req.CreateSelfSigned(DateTimeOffset.Now, DateTimeOffset.Now.AddYears(5));

//var req = new CertificateRequest("cn=foobar", ecdsa, HashAlgorithmName.SHA256);
//return req.CreateSelfSigned(DateTimeOffset.Now, DateTimeOffset.Now.AddYears(5));

return CreateSelfSignedRequest("cn=foobar", ecdsa, HashAlgorithmName.SHA256);
}

private X509Certificate2 CreateSelfSignedRequest(string subjectName, ECDsa key, HashAlgorithmName hashAlgorithm)
{
Type certificateRequestType = Type.GetType("System.Security.Cryptography.X509Certificates.CertificateRequest");

object request = certificateRequestType?.GetConstructor(new[] { subjectName.GetType(), key.GetType(), hashAlgorithm.GetType() })
?.Invoke(new object[] { subjectName, key, hashAlgorithm });

return (X509Certificate2)certificateRequestType?.GetMethod("CreateSelfSigned")?.Invoke(request, new object[] { DateTimeOffset.Now, DateTimeOffset.Now.AddYears(5) });
}
}
}
2 changes: 1 addition & 1 deletion Gigya.Microdot.Common.Tests/FakesLoggersModules.cs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
using System;
using Gigya.Microdot.Fakes;
using Gigya.Microdot.Interfaces.Events;
using Gigya.Microdot.Interfaces.Logging;
using Gigya.Microdot.Ninject;
using Ninject;
using Ninject.Syntax;
using System;

namespace Gigya.Microdot.Common.Tests
{
Expand Down
25 changes: 12 additions & 13 deletions Gigya.Microdot.Common.Tests/Gigya.Microdot.Common.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net472</TargetFramework>
<AssemblyTitle>Gigya.Microdot.Common.Tests</AssemblyTitle>
<CodeAnalysisRuleSet>$(SolutionDir)main.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Gigya.Microdot.Fakes\Gigya.Microdot.Fakes.csproj" />
<ProjectReference Include="..\Gigya.Microdot.Hosting\Gigya.Microdot.Hosting.csproj" />
<ProjectReference Include="..\Gigya.Microdot.Interfaces\Gigya.Microdot.Interfaces.csproj" />
<ProjectReference Include="..\Gigya.Microdot.Ninject\Gigya.Microdot.Ninject.csproj" />
<ProjectReference Include="..\Gigya.Microdot.SharedLogic\Gigya.Microdot.SharedLogic.csproj" />
</ItemGroup>
<Import Project="..\.paket\Paket.Restore.targets" />
<PropertyGroup>
<AssemblyTitle>Gigya.Microdot.Common.Tests</AssemblyTitle>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Gigya.Microdot.Fakes\Gigya.Microdot.Fakes.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="NSubstitute" />
</ItemGroup>
<ItemGroup Label="WS pinning">
<PackageReference Include="System.Text.RegularExpressions" />
</ItemGroup>
</Project>
6 changes: 3 additions & 3 deletions Gigya.Microdot.Common.Tests/KernelTestingExtensions.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
using System;
using System.Diagnostics;
using Gigya.Microdot.Common.Tests;
using Gigya.Microdot.Common.Tests;
using Gigya.Microdot.Hosting;
using Gigya.Microdot.Interfaces;
using Gigya.Microdot.Interfaces.Logging;
using Gigya.Microdot.SharedLogic.HttpService;
using Ninject;
using System;
using System.Diagnostics;


namespace Gigya.Microdot.Fakes.KernelUtils
Expand Down
4 changes: 1 addition & 3 deletions Gigya.Microdot.Common.Tests/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Runtime.InteropServices;

// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
Expand Down
4 changes: 2 additions & 2 deletions Gigya.Microdot.Common.Tests/SpyEventPublisher.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System.Collections.Concurrent;
using System.Threading.Tasks;
using Gigya.Microdot.Interfaces.Events;
using NSubstitute;
using System.Collections.Concurrent;
using System.Threading.Tasks;

namespace Gigya.Microdot.Common.Tests
{
Expand Down
6 changes: 0 additions & 6 deletions Gigya.Microdot.Common.Tests/paket.references

This file was deleted.

4 changes: 2 additions & 2 deletions Gigya.Microdot.Configuration/ConfigCache.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
// POSSIBILITY OF SUCH DAMAGE.
#endregion

using Gigya.Microdot.Interfaces.Logging;
using Newtonsoft.Json.Linq;
using System;
using System.Linq;
using System.Threading.Tasks;
using System.Threading.Tasks.Dataflow;
using Gigya.Microdot.Interfaces.Logging;
using Newtonsoft.Json.Linq;

namespace Gigya.Microdot.Configuration
{
Expand Down
2 changes: 1 addition & 1 deletion Gigya.Microdot.Configuration/ConfigFileDeclaration.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
// POSSIBILITY OF SUCH DAMAGE.
#endregion

using System;
using Newtonsoft.Json;
using System;

namespace Gigya.Microdot.Configuration
{
Expand Down
12 changes: 6 additions & 6 deletions Gigya.Microdot.Configuration/ConfigItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@
// POSSIBILITY OF SUCH DAMAGE.
#endregion

using Gigya.Common.Contracts.Exceptions;
using Gigya.Microdot.Interfaces.Configuration;
using Gigya.Microdot.SharedLogic.Exceptions;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Text.RegularExpressions;
using System.Xml;
using Gigya.Common.Contracts.Exceptions;
using Gigya.Microdot.Interfaces.Configuration;
using Gigya.Microdot.SharedLogic.Exceptions;

namespace Gigya.Microdot.Configuration
{
Expand Down Expand Up @@ -89,15 +89,15 @@ public string Value
public XmlNode Node { get; set; }


static readonly Regex MATCH_ENCRYPTED_CONFIG_STRING = new Regex(@"\$enc\((?<aaa>.*?)\)", RegexOptions.IgnoreCase | RegexOptions.ExplicitCapture | RegexOptions.Compiled);
static readonly Regex MATCH_ENCRYPTED_CONFIG_STRING = new(@"\$enc\((?<encrypted>.*?)\)", RegexOptions.IgnoreCase | RegexOptions.ExplicitCapture | RegexOptions.Compiled);


private string DecryptRawValue(string rawValue)
{
return MATCH_ENCRYPTED_CONFIG_STRING.Replace(rawValue, m =>
{
var inner = m.Groups[1].Value;
if (ConfigDecryptor. IsValidEncryptedStringFormat(inner))
var inner = m.Groups["encrypted"].Value;
if (ConfigDecryptor.IsValidEncryptedStringFormat(inner))
{
try
{
Expand Down
3 changes: 1 addition & 2 deletions Gigya.Microdot.Configuration/ConfigurationFilesWatcher.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,11 @@
// POSSIBILITY OF SUCH DAMAGE.
#endregion

using Gigya.Microdot.LanguageExtensions;
using System;
using System.IO;
using System.Threading;
using System.Threading.Tasks.Dataflow;
using Gigya.Microdot.LanguageExtensions;
using Gigya.Microdot.SharedLogic.Utils;

namespace Gigya.Microdot.Configuration
{
Expand Down
Loading