Branch:
main
dev
davidfowl/common-services
davidfowl/remove-envoy
davidfowl/usings
dependabot/npm_and_yarn/src/Web/WebSPA/Client/engine.io-and-socket.io-6.4.2
dependabot/npm_and_yarn/src/Web/WebSPA/Client/fast-xml-parser-and-is-svg-4.2.4
dependabot/npm_and_yarn/src/Web/WebSPA/Client/socket.io-parser-4.2.4
dependabot/npm_and_yarn/src/Web/WebSPA/Client/word-wrap-1.2.4
dotnet3-migration/dev-dotnet3
dotnet3-migration/dev-pre-merge
dotnet3-migration/dotnet3-pre-merge
dotnet3-migration/reorganize-folders
explore/identity-server-login-flow
feature/3.1-upgrade
feature/add-retry-with-new-jitter-implementation
feature/enable-local-tls-docker-compose
feature/enable-tye
feature/open-telemetry
feature/refactor_remove_saveEntities_and_migrate_functionality_to_saveChanges
features/addIntegrationIstio
features/migration-dotnet3
fix/1181
fix/1224
fix/devops-build-error
fix/devops-pipelines
fix/post-release-fixes
fix/update_packages_from_webspa
main
migration/net-5
migration/packages-upgrade
migration/webmvc/net-6
rebond/dev
release/net-3.1.1
release/net-5
test/fix-build-error
update/angular-version
vs2015
v2.05
v2.0.5
netcore2.2
netcore1.1
edu
dev-force-reset-bff
bff-merge-into-dev
6.0.0
5.0.0
3.1.1
3.1.0
3.0.0
2.2.1
2.2.0
2.0.8
2.0.7
2.0.6
2.0
1 Commits (main)
1 Commits (main)
| Author | SHA1 | Message | Date |
|---|---|---|---|
 Nish Anil
|
31ab9b62b9
|
Merge 3.1.1(release) to Main (#1583)
* Fix functional tests of Marketing * remove mvc routing spa * move background task * restore background config * background * Add health check in Ordering.BackgroundTask project * add package version to dependencies.props * ordering.api error integrationevents * remove not needed code * Fix authentication in Ordering.SignalR * Create ReadMe.md * partial checkin trying to fix checkout process * add grpc basket * first approach * restore options and grpc calling from console app it's working * Partial checkin * fix grpc call from mobile bff to basket.api and add ordering, in ordering controller * migrate web bff to 3.0 and apply grcp in order controller * Add proto to catalog * Moved some files to ./src/ * Moved .env to src * partial checkin * web bff endpoint /api/v1/Basket working in grpc * refactoring the grpc client * refactored the grpc client * Update Dockerfiles for use /src as build context root * refactor mobile bff * Deleted unneeded Dockerfile * update dockerfiles * Fix mvc calls to grpc * temporal fix to get the order in local dbset of orders for UpdateOrderWhenBuyerAndPaymentMethodVerifiedDomainEventHandler.cs * add using * fix checkout process of mvc app * Migrate packages in preview7 to preview8 * fix identity server * standarize the productId type * format * Add missing key in appsettings * fix version problems with identity server * Add layers in docker for npm install * fix problems with spa adding items to basket * add polly for grpc calls * Fix identity server * fix tests of basket * fix unit test of basket * fix ordering tests * updated compose and 1st envoy config * updated config files * update to helm charts for grpc config * fixed ending 0 in values.yaml for catalog * Final charts tunning and allowing Linkerd Mesh to be used * update to net3 rc1 * Configuration of envoy routes and minor code fixes * missing word in comment :p * updated charts for local k8s deployment * Fixing some generic issues * Added web shoping agg to mesh * ApiGW added to mesh. Ingress updated for Linkerd * Final adjustments to make envoy work with ingress and remove Polly from http calls * Removing unneeded files. Making compatible FailingMiddleware & Healthchecks * Changes in compose config for docker-compose up running ok. Added volumes for data * Update dockerfile.develop to net3 * Readme updated to net3 * fixed path in azure devops build * Sort package references * Aling basket-data-test entry with base .yml * Remove unnecessary commands from dockerfiles * Add back logging traces referenced in the wiki * Remove string interpolation from logging * Change obsolete .ForSqlServerUseSequenceHiLo for .UseHiLo * Remove obsolete warning configuration * Replace obsolete IHostingEnvironment for IWebHostEnvironment * Remove obsolete references * Sort dependencies.props * Removed obsolete folders * Fix webstatus configuration for docker-compose * Update README.md * MVC working with SignalR without Envoy * Remove SignalR transport parameter on clients * Remove unsupported ServiceFabric folder * Remove obsolete folders * Reorganize project folders * Improve docker build cache usage * Add IdentityUrlExternal config in appsettings * Fix tests compilation errors * Run unit and integration tests from VS * Add required configuration * Fix to close issue #1162 * Add configuration value for running in Mac * Relocate/remove folders * Remove old test docs already in wiki * Move more obsolete files * Move auxiliary solution files to "to-fix" folder * Remove obsolete files/folders * Relocate mobile solutions, remove obsolete ones. * Rename script to create aks resource * Add comment to Create-DockerfileSolutionRestore.ps1 script * Remove deleted folder from .gitignore * Remove obsolete files * Make installation work in local kubernetes * Update README * Move/remove obsolete folders * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Streamline README, add links to Wiki * Minor README updates * Bold release notes * Fix SignalR + MVC through Envoy * Change dockerhub microsoft images to mcr * Fix services test containers * Fix SignalR + SPA through Envoy * Fix paths for moved folders * Comment out windows jobs * Fix healthchecks configuration values * Configure Envoy to forward SignalR notifications * Unify dashboard setup yaml * Simplify ingress setup files * Explore adding CSP * Update to 3.1 - Fix test to work on Catalog.API controller, using in-memory database * Don't force LongPolling for SignalR * Update base images to 3.1 * Upgrade Locations to 3.1 * Relocate network-related scripts * tls support * Update packages * Add missing await * Update to IHost - Return IHost from CreateHostBuilder - Register AutoFac with UseServiceProviderFactory() in CreateHostBuilder * Add back looging to Seq and Logstash * Fix services names in azure-pipelines * Update README.md * fixed https://github.com/dotnet-architecture/eShopOnContainers/issues/1181 * Fix npm & docker build warnings #1224 Update Angular 7 to 8 to fix warnings and vulnerabilities * Diferentiate displayNames * Add project-directory param for compose * Add -f parameter * Add cache use comment to Dockerfiles to force PR validation * minor change to requeue DevOps validation * User internal docker dns names * Update README.md * Error fixed, applied the cookie policy to lax mode * disable windows containers in buildimages and multiarch yaml (#1287) * disable windows containers in buildimages and multiarch yaml * fix space * disabled delopy in windows and prefixes * Change extension method to load the configuration * fix authorization in webhooks api * Remove obsolete middleware UseApplicationInsights * Fix/include pipeline yml in trigger (#1290) * add trigger to include pipelines * Update build/azure-devops/webhooks-client/azure-pipelines.yml Co-Authored-By: Miguel Veloso <mvelosop@gmail.com> Co-authored-by: Miguel Veloso <mvelosop@gmail.com> * Executed npm audit fix and npm update * Executed npm audit fix * correct call order of "app.UseCors" * Updated readme with new book cover icon * Bump npm-registry-fetch from 4.0.2 to 4.0.5 in /src/Web/WebSPA (#1361) Bumps [npm-registry-fetch](https://github.com/npm/registry-fetch) from 4.0.2 to 4.0.5. - [Release notes](https://github.com/npm/registry-fetch/releases) - [Changelog](https://github.com/npm/npm-registry-fetch/blob/latest/CHANGELOG.md) - [Commits](https://github.com/npm/registry-fetch/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump lodash from 4.17.15 to 4.17.19 in /src/Web/WebSPA (#1365) Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump jquery from 3.4.1 to 3.5.0 in /src/Web/WebSPA (#1313) Bumps [jquery](https://github.com/jquery/jquery) from 3.4.1 to 3.5.0. - [Release notes](https://github.com/jquery/jquery/releases) - [Commits](https://github.com/jquery/jquery/compare/3.4.1...3.5.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump websocket-extensions from 0.1.3 to 0.1.4 in /src/Web/WebSPA (#1336) Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-node) from 0.1.3 to 0.1.4. - [Release notes](https://github.com/faye/websocket-extensions-node/releases) - [Changelog](https://github.com/faye/websocket-extensions-node/blob/master/CHANGELOG.md) - [Commits](https://github.com/faye/websocket-extensions-node/compare/0.1.3...0.1.4) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Updated readme.md with mslearn link * Moved mslearn section on top * Fixed typo in README (#1375) * Shifting MS learn section on top. * Fix/1370 - Updated script related changes for helm 3.x and k8s 1.16.x (#1378) * Fix for helm 3 and k8s 1.16 * Inclusion of archived directory under k8s * separate deploy-all powershell script for local Mac OS deployment. * Bump elliptic from 6.4.1 to 6.5.3 in /src/Web/WebSPA (#1381) Bumps [elliptic](https://github.com/indutny/elliptic) from 6.4.1 to 6.5.3. - [Release notes](https://github.com/indutny/elliptic/releases) - [Commits](https://github.com/indutny/elliptic/compare/v6.4.1...v6.5.3) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Swamy/remove unused using and refactoring entity classes (#1371) * Removed Unused Usings * Code Refactoring for readbility. Added spaces and moved the classes to separate file * Removed unused usings from ModelDTOs (#1373) * Updated dot-prop version to 5.1.1 (#1382) * Update README.md * Update README.md * Updated Readme. * Fixed firewall rules check and improved the script the check shall be like ~ Get-NetFirewallRule -DisplayName eShopOnContainers-* -ErrorAction Stop * Updated serialize-javascript version to 3.1.0 (#1396) * Update "minimist" version to 1.2.5 (#1398) * #1397: Replaced deprecated docker.for.win.localhost by host.docker.internal in src/.env (#1400) * Updated Readme (#1402) Fixed sentence structure in Readme. Changed "and a several" to "with several." * CatalogService: Fix issue with Status set when items list is empty (#1304) * Fix issue with Status set when items list is empty * Change method Count() call to Count property Co-authored-by: Dmytro Hridin <v-dmytro.hridin@lionbridge.com> * refactored Equals() method on ValueObject (#1316) * Fix/1403and1404 removed duplicate Key SubscriptionClientName and added app.UseAuthorization() call (#1406) * #1403 removed duplicate Key SubscriptionClientName Removed duplicate key SubscriptionClientName from Tests/Services/Application.FunctionalTests/Services/Marketing/appsettings.json and sorted its content in asc order. * #1404 Added app.UseAuthorization() call Added app.UseAuthorization() call to BasketTestsStartup, LocationsTestsStartup, and MarketingTestsStartup to fix failed unit tests IntegrationEventsScenarios.Post_update_product_price_and_catalog_and_basket_list_modified and MarketingScenarios.Set_new_user_location_and_get_location_campaign_by_user_id (see #1404) * Fix for Campaigns exception and SignalR 401 Unauthorized (#1374) * update API Gateway - /locations-api/ @ webmarketing/envoy.yaml * updated signalr services - envoy: webmarketingapigw - latest client: webmvc - service hub: ordering-signalrhub Co-authored-by: hfz-r <hafiz.roslan@hartalega.com.my> * Mis-Spelled 'client' (#1411) * fix parameter error in multiarch job (#1413) * Private readonly string changed to private const string (#1288) * fix disposing of direct instantiated objects in calalog service #1392 (#1395) * Updated version of different packages. (#1420) * for issue #1423: changed literal string "OpenIdConnect" to constant string (#1424) Co-authored-by: Jeremiah Flaga <j.flaga@arcanys.com> * Updated node-fetch package version. (#1426) * Updated node-fetch package version. * Updated node-forge version. * Fixes #1474: webspa container does not build when running docker-compose up.Updated sha hashes in packages-lock.json (#1475) * Change ReadAllBytes to ReadAllBytesAsync in PicController (#1425) * Fixed parameter bug create resource script (#1494) * Fixed invalid number format in webspa (#1496) * Updated package version of webpack-subresource-integrity (#1497) * Fixed #1495 bug : UseLoadTest missing claimsType (#1508) * Update ByPassAuthMiddleware.cs * Update ByPassAuthMiddleware.cs * remove WebMVC/ByPassAuthMiddleware duplicate cliam * remove Ordering.API/ByPassAuthMid duplicate cliam * remove Location.API/ByPassAuthMid duplicate cliam * remove Market.API/ByPassAuthMid duplicate cliam * change webmvc bypassauth: claimType of sub * change ordering bypassauth: claimType of sub * change location bypassauth: claimType of sub * change market bypassauth: claimType of sub * Update solution items (#1515) Co-authored-by: Manuel Cañete <mcanete@protonmail.com> * Updated solution file. (#1514) * Fixed #1518 bug (#1520) * Update CatalogContextModelSnapshot.cs * Update CatalogContextSeed.cs * Modify CSV data * Give PictureFileName assignment * Fix PurchaseUrl port in WebSPA appsettings.json (#1525) * Updated highlight version to latest. (#1531) * Finished sentence and fixed spelling mistake. (#1536) * Updated credit card default exipiration value. (#1535) * Fix login issue Exception: Correlation failed (#1516) Fix samesite issue when running eShop from docker-compose locally as by default http protocol is being used Refer to https://github.com/dotnet-architecture/eShopOnContainers/issues/1391 * Updated getting started section in readme file. (#1538) * Updated get started section in readme file. * Updated docker-compose specific link * Updated instructions in the readme file. * Updated packages to latest version. (#1539) * Update README.md * fix(#1261): remove helm chart indent for config map glob (#1533) * Updated ini package in package-lock.json file. (#1541) * Removed unnecessary await (#1546) * 1. remove unused using, 2. Reorganized the using, 3. Moved the class into separate file and 4. Added line and spacing formats (#1532) * Removed Unused Using and Reorganized the Using * Removed unused using, Reorganized using, moved the class to separate file, removed commented code in Catalog.API * Revert "Removed unused using, Reorganized using, moved the class to separate file, removed commented code in Catalog.API" This reverts commit |
4 years ago |
 Gajendra Babu Thokala [MSFT]
|
896442a0bf
|
Updateded to Show Message to run as administrator
Updateded to Show Message to run as administrator.
When run without elevated below message would be shown. Which is clear to run as administrator
.\set-dockernat-networkategory-to-private.ps1 : The script 'set-dockernat-networkategory-to-private.ps1' cannot be run
because it contains a "#requires" statement for running as Administrator. The current Windows PowerShell session is
not running as Administrator. Start Windows PowerShell by using the Run as Administrator option, and then try running
the script again.
At line:1 char:1
+ .\set-dockernat-networkategory-to-private.ps1
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ CategoryInfo : PermissionDenied: (set-dockernat-n...-to-private.ps1:String) [], ScriptRequiresException
+ FullyQualifiedErrorId : ScriptRequiresElevation
|
5 years ago |
 Gajendra Thokala
|
7dd819c4b5 | Add Powershell script to set network category to private for DockerNAT. | 5 years ago |