Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

Merge 3.1.1(release) to Main #1583

Merged
merged 305 commits into from
Jan 20, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
305 commits
Select commit Hold shift + click to select a range
aee00cf
Merge branch 'features/#74830' into features/migration-dotnet3
erikpique Aug 5, 2019
48bc95f
Fix functional tests of Marketing
Aug 5, 2019
ceb3d9b
Merge branch 'features/migration-dotnet3' of https://github.com/dotne…
Aug 5, 2019
17faebf
remove mvc routing spa
erikpique Aug 6, 2019
2891044
merge
erikpique Aug 6, 2019
56f3a6b
move background task
erikpique Aug 6, 2019
7ea094b
restore background config
erikpique Aug 6, 2019
51070db
Merge branch 'features/restore' into features/migration-dotnet3
erikpique Aug 6, 2019
0988dcd
background
erikpique Aug 7, 2019
d29f6c2
Add health check in Ordering.BackgroundTask project
Aug 7, 2019
4a30a1c
add package version to dependencies.props
Aug 7, 2019
216463f
ordering.api error integrationevents
erikpique Aug 7, 2019
c8da440
remove not needed code
Aug 8, 2019
f1cb1b6
Fix authentication in Ordering.SignalR
Aug 8, 2019
da6f9d7
Create ReadMe.md
nishanil Aug 8, 2019
bf85169
partial checkin trying to fix checkout process
Aug 12, 2019
568dabc
Merge branch 'features/migration-dotnet3' of https://github.com/dotne…
Aug 12, 2019
fe0fd36
add grpc basket
erikpique Aug 19, 2019
e58429a
first approach
Aug 26, 2019
9b1c690
restore options and grpc calling from console app it's working
Aug 26, 2019
016089f
Partial checkin
Aug 27, 2019
3f61eb0
fix grpc call from mobile bff to basket.api and add ordering, in orde…
Aug 27, 2019
e415f2a
migrate web bff to 3.0 and apply grcp in order controller
Aug 27, 2019
67af71d
Add proto to catalog
Aug 28, 2019
11fe3fc
Moved some files to ./src/
eiximenis Aug 28, 2019
011dc71
Moved .env to src
eiximenis Aug 28, 2019
3fee58e
partial checkin
Aug 28, 2019
260bfcb
web bff endpoint /api/v1/Basket working in grpc
Aug 28, 2019
311e1a2
refactoring the grpc client
Aug 28, 2019
454525d
refactored the grpc client
Aug 28, 2019
8703638
Update Dockerfiles for use /src as build context root
eiximenis Aug 28, 2019
63e20bb
refactor mobile bff
Aug 28, 2019
e18c74f
Merge branch 'features/grpc' of https://github.com/dotnet-architectur…
Aug 28, 2019
f83b873
Deleted unneeded Dockerfile
eiximenis Aug 28, 2019
7f88a71
update dockerfiles
Aug 29, 2019
9bb640a
Merge branch 'features/grpc' of https://github.com/dotnet-architectur…
Aug 29, 2019
4398b25
Fix mvc calls to grpc
Aug 29, 2019
1075910
temporal fix to get the order in local dbset of orders for UpdateOrde…
Aug 29, 2019
e689cfd
add using
Aug 29, 2019
ffe2884
fix checkout process of mvc app
Aug 30, 2019
f8c42c2
Migrate packages in preview7 to preview8
Sep 2, 2019
1671062
fix identity server
Sep 3, 2019
791e7d6
standarize the productId type
Sep 4, 2019
01b8d50
format
Sep 4, 2019
a85713c
Add missing key in appsettings
Sep 4, 2019
b7852f2
fix version problems with identity server
Sep 4, 2019
bd1daf2
Add layers in docker for npm install
Sep 4, 2019
adb061c
fix problems with spa adding items to basket
Sep 4, 2019
bcb0455
add polly for grpc calls
Sep 4, 2019
a29a34f
Fix identity server
Sep 5, 2019
977e6ce
fix tests of basket
Sep 5, 2019
57f7c50
fix unit test of basket
Sep 5, 2019
42b3444
fix ordering tests
Sep 5, 2019
efa7d3b
updated compose and 1st envoy config
eiximenis Sep 10, 2019
b86771e
Merge branch 'features/grpc' of https://github.com/dotnet-architectur…
eiximenis Sep 10, 2019
7c6b5b9
Merge branch 'features/grpc' into features/migration-dotnet3
eiximenis Sep 10, 2019
784ad9d
updated config files
eiximenis Sep 10, 2019
f441fcf
update to helm charts for grpc config
eiximenis Sep 10, 2019
171ee62
fixed ending 0 in values.yaml for catalog
eiximenis Sep 10, 2019
a2053de
Final charts tunning and allowing Linkerd Mesh to be used
eiximenis Sep 10, 2019
9b57122
update to net3 rc1
eiximenis Sep 19, 2019
d68c9e4
Configuration of envoy routes and minor code fixes
eiximenis Sep 19, 2019
9367c32
missing word in comment :p
eiximenis Sep 19, 2019
dc2e7c2
updated charts for local k8s deployment
eiximenis Sep 19, 2019
60998cb
Fixing some generic issues
eiximenis Sep 27, 2019
bc8e33a
Added web shoping agg to mesh
eiximenis Sep 27, 2019
c124e9e
ApiGW added to mesh. Ingress updated for Linkerd
eiximenis Sep 30, 2019
08e9b26
Final adjustments to make envoy work with ingress and remove Polly fr…
eiximenis Oct 1, 2019
0df81ff
Removing unneeded files. Making compatible FailingMiddleware & Health…
eiximenis Oct 15, 2019
e4df033
Changes in compose config for docker-compose up running ok. Added vol…
eiximenis Oct 16, 2019
34a0c03
Update dockerfile.develop to net3
eiximenis Oct 31, 2019
d2d33da
Readme updated to net3
eiximenis Oct 31, 2019
87f38fd
fixed path in azure devops build
eiximenis Oct 31, 2019
b34b8d2
Sort package references
mvelosop Nov 6, 2019
8712d7e
Aling basket-data-test entry with base .yml
mvelosop Nov 6, 2019
8bc0f73
Merge branch 'dotnet3-migration/dotnet3-pre-merge' into features/migr…
mvelosop Nov 6, 2019
e8d99c0
Merge branch 'features/migration-dotnet3' into dotnet3-migration/dev-…
mvelosop Nov 7, 2019
5013ff4
Remove unnecessary commands from dockerfiles
mvelosop Nov 7, 2019
a1f64f9
Add back logging traces referenced in the wiki
mvelosop Nov 7, 2019
866e89c
Remove string interpolation from logging
mvelosop Nov 8, 2019
c3f7178
Change obsolete .ForSqlServerUseSequenceHiLo for .UseHiLo
mvelosop Nov 8, 2019
69de1a3
Remove obsolete warning configuration
mvelosop Nov 8, 2019
0c14810
Replace obsolete IHostingEnvironment for IWebHostEnvironment
mvelosop Nov 8, 2019
dcd0f3f
Remove obsolete references
mvelosop Nov 8, 2019
c6cda44
Sort dependencies.props
mvelosop Nov 8, 2019
dd5ae1b
Removed obsolete folders
mvelosop Nov 8, 2019
a0cc03d
Fix webstatus configuration for docker-compose
mvelosop Nov 14, 2019
3ece346
Update README.md
eiximenis Nov 15, 2019
a032959
Merge branch 'dotnet3-migration/dev-dotnet3' of https://github.com/do…
eiximenis Nov 15, 2019
556c07b
MVC working with SignalR without Envoy
mvelosop Nov 15, 2019
30aeec8
Remove SignalR transport parameter on clients
mvelosop Nov 16, 2019
09539f7
Remove unsupported ServiceFabric folder
mvelosop Nov 16, 2019
6ab89ae
Remove obsolete folders
mvelosop Nov 16, 2019
ade6358
Reorganize project folders
mvelosop Nov 18, 2019
593be81
Improve docker build cache usage
mvelosop Nov 18, 2019
8734958
Add IdentityUrlExternal config in appsettings
mvelosop Nov 18, 2019
4b48468
Fix tests compilation errors
mvelosop Nov 18, 2019
3adb63a
Run unit and integration tests from VS
mvelosop Nov 18, 2019
37fdbf3
Add required configuration
mvelosop Nov 18, 2019
285b0ce
Fix to close issue #1162
mvelosop Nov 20, 2019
f39e090
Add configuration value for running in Mac
mvelosop Nov 20, 2019
b3a0c86
Relocate/remove folders
mvelosop Nov 20, 2019
41385b4
Remove old test docs already in wiki
mvelosop Nov 20, 2019
643d09a
Move more obsolete files
mvelosop Nov 20, 2019
6af743c
Move auxiliary solution files to "to-fix" folder
mvelosop Nov 20, 2019
38db586
Remove obsolete files/folders
mvelosop Nov 21, 2019
2e76937
Relocate mobile solutions, remove obsolete ones.
mvelosop Nov 21, 2019
aafd889
Rename script to create aks resource
mvelosop Nov 21, 2019
7faa1a4
Add comment to Create-DockerfileSolutionRestore.ps1 script
mvelosop Nov 21, 2019
b24c48c
Remove deleted folder from .gitignore
mvelosop Nov 21, 2019
fd69625
Remove obsolete files
mvelosop Nov 22, 2019
025d13e
Make installation work in local kubernetes
mvelosop Nov 23, 2019
b8c6648
Merge commit '025d13e4ca8e2ea41db0caab4344aded0ffdc0d6' into dotnet3-…
mvelosop Nov 23, 2019
fb6c66f
Merge commit '897c924b5b162ec8eefb39c4a2c03e5a420f672b' into dotnet3-…
mvelosop Nov 23, 2019
a4ef680
Update README
mvelosop Nov 26, 2019
759c061
Move/remove obsolete folders
mvelosop Nov 26, 2019
43fe719
Merge branch 'dotnet3-migration/dev-dotnet3' into dev
mvelosop Nov 26, 2019
915cb58
Update README.md
nishanil Nov 28, 2019
6525dce
Update README.md
nishanil Nov 28, 2019
3466fa1
Update README.md
nishanil Nov 28, 2019
5742bea
Update README.md
nishanil Nov 28, 2019
9df8c71
Update README.md
nishanil Nov 28, 2019
f3613b1
Update README.md
nishanil Nov 28, 2019
0c24665
Streamline README, add links to Wiki
mvelosop Nov 28, 2019
dcdf661
Minor README updates
mvelosop Nov 29, 2019
8cc6808
Bold release notes
mvelosop Nov 29, 2019
f88d8c4
Fix SignalR + MVC through Envoy
mvelosop Dec 2, 2019
ae8130c
Change dockerhub microsoft images to mcr
mvelosop Dec 2, 2019
a9fc1e2
Fix services test containers
mvelosop Dec 2, 2019
cd536dc
Fix SignalR + SPA through Envoy
mvelosop Dec 2, 2019
4481cc3
Fix paths for moved folders
mvelosop Dec 3, 2019
01c7dd0
Comment out windows jobs
mvelosop Dec 3, 2019
d42be1b
Fix healthchecks configuration values
mvelosop Dec 5, 2019
62db948
Configure Envoy to forward SignalR notifications
mvelosop Dec 5, 2019
83deb04
Unify dashboard setup yaml
mvelosop Dec 5, 2019
0e69843
Simplify ingress setup files
mvelosop Dec 5, 2019
c84be74
Explore adding CSP
mvelosop Dec 5, 2019
42fe72e
Merge branch 'fix/devops-pipelines' into fix/post-release-fixes
mvelosop Dec 9, 2019
b5ab54a
Merge branch 'fix/post-release-fixes' into dev
mvelosop Dec 9, 2019
60b2805
Update to 3.1
mvelosop Dec 16, 2019
5a442cb
Don't force LongPolling for SignalR
mvelosop Dec 16, 2019
3a1aff0
Update base images to 3.1
mvelosop Dec 16, 2019
f8ea1ee
Upgrade Locations to 3.1
mvelosop Dec 16, 2019
97956a5
Relocate network-related scripts
mvelosop Dec 17, 2019
f47d688
tls support
eiximenis Dec 17, 2019
ad555d5
Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnC…
eiximenis Dec 17, 2019
44d3fcf
Update packages
mvelosop Dec 17, 2019
28b8a5e
Add missing await
mvelosop Dec 17, 2019
49358ae
Update to IHost
mvelosop Dec 18, 2019
a77b158
Add back looging to Seq and Logstash
mvelosop Dec 18, 2019
33c8cc2
Merge branch 'feature/3.1-upgrade' into dev
mvelosop Dec 18, 2019
9436aa2
Fix services names in azure-pipelines
mvelosop Dec 19, 2019
229b640
Merge branch 'fix/devops-build-error' into dev
mvelosop Dec 19, 2019
ee0621a
Update README.md
nishanil Jan 14, 2020
314c674
fixed https://github.com/dotnet-architecture/eShopOnContainers/issues…
erikpique Jan 21, 2020
5f1bdbc
Fix npm & docker build warnings #1224
erikpique Jan 24, 2020
1da56f8
Diferentiate displayNames
Jan 24, 2020
0dbf2f8
Add project-directory param for compose
Jan 24, 2020
fd382d5
Add -f parameter
Jan 24, 2020
cf7c16a
Merge pull request #1228 from dotnet-architecture/test/fix-build-error
mvelosop Jan 27, 2020
135c56a
Add cache use comment to Dockerfiles to force PR validation
mvelosop Jan 27, 2020
98f5786
Merge pull request #1227 from dotnet-architecture/fix/1224
mvelosop Jan 27, 2020
bc74f7c
minor change to requeue DevOps validation
mvelosop Jan 27, 2020
5d0cd50
Merge pull request #1222 from dotnet-architecture/fix/1181
mvelosop Jan 27, 2020
0087ff4
User internal docker dns names
mvelosop Jan 28, 2020
20238d5
Merge pull request #1231 from dotnet-architecture/fix/docker-2.2-mvc-…
mvelosop Jan 29, 2020
d227823
Update README.md
nishanil Feb 25, 2020
9cb1c9e
Error fixed, applied the cookie policy to lax mode
ericuss Apr 2, 2020
e652517
Merge pull request #1285 from dotnet-architecture/fix/chrome_samesite…
mvelosop Apr 2, 2020
5b17183
disable windows containers in buildimages and multiarch yaml (#1287)
ericuss Apr 6, 2020
e671f32
Change extension method to load the configuration
ericuss Apr 7, 2020
07aba24
fix authorization in webhooks api
ericuss Apr 7, 2020
09fabcd
Remove obsolete middleware UseApplicationInsights
ericuss Apr 7, 2020
b202489
Merge pull request #1289 from dotnet-architecture/features/change_Use…
mvelosop Apr 7, 2020
c948bee
Fix/include pipeline yml in trigger (#1290)
ericuss Apr 7, 2020
562831a
Executed npm audit fix and npm update
ericuss Apr 7, 2020
c4b5906
Executed npm audit fix
ericuss Apr 7, 2020
b1021c8
Merge pull request #1291 from dotnet-architecture/fix/update_packages…
mvelosop Apr 15, 2020
beda837
correct call order of "app.UseCors"
CMor1184 Jun 8, 2020
9ec4837
Merge pull request #1337 from morgenthaler-de/cors_order
mvelosop Jun 17, 2020
3f0651c
Updated readme with new book cover icon
sughosneo Jul 22, 2020
ef15d59
Merge pull request #1369 from sughosneo/fix/update-readme
nishanil Jul 22, 2020
1522c14
Bump npm-registry-fetch from 4.0.2 to 4.0.5 in /src/Web/WebSPA (#1361)
dependabot[bot] Jul 22, 2020
6bd3301
Bump lodash from 4.17.15 to 4.17.19 in /src/Web/WebSPA (#1365)
dependabot[bot] Jul 22, 2020
0587904
Bump jquery from 3.4.1 to 3.5.0 in /src/Web/WebSPA (#1313)
dependabot[bot] Jul 22, 2020
99bbbfb
Bump websocket-extensions from 0.1.3 to 0.1.4 in /src/Web/WebSPA (#1336)
dependabot[bot] Jul 22, 2020
edf5394
Updated readme.md with mslearn link
sughosneo Jul 22, 2020
eece981
Moved mslearn section on top
sughosneo Jul 24, 2020
35bd66e
Fixed typo in README (#1375)
smholvoet Jul 28, 2020
75fdb3d
Shifting MS learn section on top.
sughosneo Jul 28, 2020
bbccef7
Fix/1370 - Updated script related changes for helm 3.x and k8s 1.16.x…
Jul 28, 2020
be39219
resolving merged conflict
sughosneo Jul 29, 2020
17e8382
Bump elliptic from 6.4.1 to 6.5.3 in /src/Web/WebSPA (#1381)
dependabot[bot] Aug 4, 2020
736320b
Swamy/remove unused using and refactoring entity classes (#1371)
vishipayyallore Aug 4, 2020
ae01a5c
Removed unused usings from ModelDTOs (#1373)
markharwood101 Aug 4, 2020
7161f54
Updated dot-prop version to 5.1.1 (#1382)
Aug 4, 2020
5644d8e
Update README.md
nishanil Aug 4, 2020
15c80da
Update README.md
nishanil Aug 4, 2020
66d60fa
Merge branch 'pr1372' into fix/update-readme
sughosneo Aug 5, 2020
87552cf
Updated Readme.
sughosneo Aug 5, 2020
84411b0
Merge pull request #1372 from sughosneo/fix/update-readme
Aug 5, 2020
6c3ab90
Fixed firewall rules check and improved the script
edmondshtogu Aug 7, 2020
3a693de
Updated serialize-javascript version to 3.1.0 (#1396)
Aug 12, 2020
8c0da9a
Update "minimist" version to 1.2.5 (#1398)
Aug 12, 2020
844348c
#1397: Replaced deprecated docker.for.win.localhost by host.docker.in…
InstanceFactory Aug 18, 2020
c8e8073
Merge pull request #1390 from EdmondShtogu/patch-2
Aug 20, 2020
7dad5c0
Updated Readme (#1402)
H3RSKO Aug 20, 2020
b426909
CatalogService: Fix issue with Status set when items list is empty (#…
dmytrohridin Aug 20, 2020
921de69
refactored Equals() method on ValueObject (#1316)
andrefilipegsilva Aug 25, 2020
df2c2bb
Fix/1403and1404 removed duplicate Key SubscriptionClientName and adde…
InstanceFactory Aug 26, 2020
85aea20
Fix for Campaigns exception and SignalR 401 Unauthorized (#1374)
hfz-r Aug 27, 2020
7617ee4
Mis-Spelled 'client' (#1411)
MajidAliKhanQuaid Aug 27, 2020
66d81f6
fix parameter error in multiarch job (#1413)
fjvela Aug 28, 2020
8f84bd3
Private readonly string changed to private const string (#1288)
Aug 28, 2020
313879e
fix disposing of direct instantiated objects in calalog service #1392…
nsedoud Aug 31, 2020
0cb8424
Updated version of different packages. (#1420)
Sep 8, 2020
7c1261b
for issue #1423: changed literal string "OpenIdConnect" to constant s…
jflaga Sep 14, 2020
6a9a781
Updated node-fetch package version. (#1426)
Sep 15, 2020
04ab127
Fixes #1474: webspa container does not build when running docker-comp…
wojciechrak Sep 18, 2020
0b4f446
Change ReadAllBytes to ReadAllBytesAsync in PicController (#1425)
zakaria-c Sep 23, 2020
78db4b7
Fixed parameter bug create resource script (#1494)
Oct 21, 2020
d910eb4
Fixed invalid number format in webspa (#1496)
Oct 21, 2020
b196622
Updated package version of webpack-subresource-integrity (#1497)
Oct 21, 2020
388d0b7
Fixed #1495 bug : UseLoadTest missing claimsType (#1508)
anjoy8 Nov 5, 2020
385318c
Update solution items (#1515)
mknet3 Nov 10, 2020
07d36e3
Updated solution file. (#1514)
Nov 10, 2020
7e59cd1
Fixed #1518 bug (#1520)
anjoy8 Nov 23, 2020
9dec3b1
Fix PurchaseUrl port in WebSPA appsettings.json (#1525)
n-stefan Nov 24, 2020
0a4110a
Updated highlight version to latest. (#1531)
Dec 1, 2020
c59e522
Finished sentence and fixed spelling mistake. (#1536)
synercoder Dec 8, 2020
2711d33
Updated credit card default exipiration value. (#1535)
Dec 8, 2020
d2a1e5a
Fix login issue Exception: Correlation failed (#1516)
huangyingting Dec 8, 2020
07a1caf
Updated getting started section in readme file. (#1538)
Dec 9, 2020
4ddfdc2
Updated packages to latest version. (#1539)
Dec 10, 2020
a88f6c5
Update README.md
nishanil Dec 10, 2020
3f051b3
fix(#1261): remove helm chart indent for config map glob (#1533)
Rosenberg96 Dec 11, 2020
6824c1c
Updated ini package in package-lock.json file. (#1541)
Dec 14, 2020
b502964
Removed unnecessary await (#1546)
GurGaller Dec 16, 2020
716aca6
1. remove unused using, 2. Reorganized the using, 3. Moved the class …
vishipayyallore Dec 17, 2020
0c575b5
Swamy/remove unused using and refactor the code (#1552)
vishipayyallore Dec 18, 2020
811874b
Swamy/remove unused using and refactor the code (#1555)
vishipayyallore Dec 23, 2020
c3d91dd
Fixed Issue #1410 (#1560)
InstanceFactory Dec 23, 2020
81e4312
Small Refactoring (#1558)
vishipayyallore Dec 28, 2020
600d0aa
Small-Formatting-Refactoring (#1564)
vishipayyallore Dec 30, 2020
6f8f247
Swamy/01jan2021-small-refactoring (#1570)
vishipayyallore Jan 4, 2021
70a5e7b
Removes dotnet.myget.org NuGetPackage feed references (#1576)
Jan 12, 2021
1e2760c
Swamy/04 jan2021-small-refactoring (#1571)
vishipayyallore Jan 15, 2021
afb4534
Fixes #1581: Fixed total decimal place issue and User hover menu disp…
hetal-kapadia Jan 18, 2021
130e46c
Swamy/15jan2021 small refactoring (#1580)
vishipayyallore Jan 19, 2021
40faa73
Incorrect ContentPage.ToolbarItems in a TabbedPage (#1348)
william-keller Jan 20, 2021
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
  •  
  •  
  •  
39 changes: 0 additions & 39 deletions .dockerignore

This file was deleted.

27 changes: 0 additions & 27 deletions .env

This file was deleted.

3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@ bld/
# Visual Studio 2015 cache/options directory
.vs/

# Dockerfile projects folder for restore-packages script
csproj-files/

# .js files created on build:
src/Web/WebMVC/wwwroot/js/site*

Expand Down
13 changes: 0 additions & 13 deletions Local.testsettings

This file was deleted.

13 changes: 0 additions & 13 deletions NuGet.config

This file was deleted.

186 changes: 74 additions & 112 deletions README.md

Large diffs are not rendered by default.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading