Upgraded to min SDK 2.17

packages/auth_oauth2/pubspec.yaml

@@ -18,5 +18,13 @@ dependency_overrides:
     path: ../container/angel_container
   angel3_framework:
     path: ../framework
+  angel3_http_exception:
+    path: ../http_exception
+  angel3_model:
+    path: ../model
+  angel3_route:
+    path: ../route
+  angel3_mock_request:
+    path: ../mock_request
   angel3_auth:
     path: ../auth

packages/auth_twitter/pubspec.yaml

@@ -1,14 +1,14 @@
 name: "angel3_auth_twitter"
 description: Angel3 authentication strategy for Twitter login. Auto-signs requests.
-version: 3.0.0
+version: 7.0.0
 homepage: https://angel3-framework.web.app/
 repository: https://github.com/dukefirehawk/angel/tree/master/packages/auth_twitter
 publish_to: none
 environment:
-  sdk: ">=2.16.0 <3.0.0"
+  sdk: ">=2.17.0 <3.0.0"
 dependencies:
-  angel3_auth: ^6.0.0
-  angel3_framework: ^6.0.0
+  angel3_auth: ^7.0.0
+  angel3_framework: ^7.0.0
   http: ^0.13.0
   path: ^1.0.0
   oauth1: ^2.0.0
@@ -16,3 +16,18 @@ dependencies:
 dev_dependencies:
   logging: ^1.0.0
   lints: ^1.0.0
+dependency_overrides:
+  angel3_container:
+    path: ../container/angel_container
+  angel3_framework:
+    path: ../framework
+  angel3_http_exception:
+    path: ../http_exception
+  angel3_model:
+    path: ../model
+  angel3_route:
+    path: ../route
+  angel3_mock_request:
+    path: ../mock_request
+  angel3_auth:
+    path: ../auth

packages/cache/pubspec.yaml

@@ -1,19 +1,42 @@
 name: angel3_cache
-version: 6.0.0
+version: 7.0.0
 description: A service that provides HTTP caching to the response data for Angel3
 homepage: https://angel3-framework.web.app/
 repository: https://github.com/dukefirehawk/angel/tree/master/packages/cache
 environment:
   sdk: '>=2.17.0 <3.0.0'
 dependencies:
-  angel3_framework: ^6.0.0
+  angel3_framework: ^7.0.0
   collection: ^1.15.0
   meta: ^1.4.0
   pool: ^1.5.0
   logging: ^1.0.0
 dev_dependencies:
-  angel3_test: ^6.0.0
+  angel3_test: ^7.0.0
   glob: ^2.0.1
   http: ^0.13.3
   test: ^1.21.0
   lints: ^2.0.0
+dependency_overrides:
+  angel3_container:
+    path: ../container/angel_container
+  angel3_framework:
+    path: ../framework
+  angel3_http_exception:
+    path: ../http_exception
+  angel3_model:
+    path: ../model
+  angel3_route:
+    path: ../route
+  angel3_mock_request:
+    path: ../mock_request
+  angel3_test:
+    path: ../test
+  angel3_websocket:
+    path: ../websocket
+  angel3_client:
+    path: ../client
+  angel3_auth:
+    path: ../auth
+  angel3_validate:
+    path: ../validate

packages/configuration/CHANGELOG.md

@@ -1,8 +1,13 @@
 # Change Log
 
+## 7.0.0
+
+* Updated to min SDK 2.17.x
+* Updated `dotenv` to 4.0.x
+
 ## 6.0.0
 
-* Updated to SDK 2.16.x
+* Updated to SDK min 2.16.x
 
 ## 5.0.0
 

packages/configuration/lib/angel3_configuration.dart

@@ -3,13 +3,13 @@ library angel3_configuration;
 import 'dart:async';
 
 import 'package:angel3_framework/angel3_framework.dart';
-import 'package:dotenv/dotenv.dart' as dotenv;
+import 'package:dotenv/dotenv.dart';
 import 'package:file/file.dart';
 import 'package:belatuk_merge_map/belatuk_merge_map.dart';
 import 'package:yaml/yaml.dart';
 
-Future<void> _loadYamlFile(Map map, File yamlFile, Map<String, String> env,
-    void Function(String msg) warn) async {
+Future<void> _loadYamlFile(
+    Map map, File yamlFile, DotEnv env, void Function(String msg) warn) async {
   if (await yamlFile.exists()) {
     var config = loadYaml(await yamlFile.readAsString());
 
@@ -58,12 +58,11 @@ Future<void> _loadYamlFile(Map map, File yamlFile, Map<String, String> env,
   }
 }
 
-Object? _applyEnv(
-    var v, Map<String, String> env, void Function(String msg) warn) {
+Object? _applyEnv(var v, DotEnv env, void Function(String msg) warn) {
   if (v is String) {
     if (v.startsWith(r'$') && v.length > 1) {
       var key = v.substring(1);
-      if (env.containsKey(key)) {
+      if (env.isDefined(key)) {
         return env[key];
       } else {
         warn(
@@ -92,11 +91,11 @@ Future<Map> loadStandaloneConfiguration(FileSystem fileSystem,
     String? envPath,
     void Function(String message)? onWarning}) async {
   var sourceDirectory = fileSystem.directory(directoryPath);
-  var env = dotenv.env;
+  var env = DotEnv(includePlatformEnvironment: true);
   var envFile = sourceDirectory.childFile(envPath ?? '.env');
 
   if (await envFile.exists()) {
-    dotenv.load(envFile.absolute.uri.toFilePath());
+    env.load([envFile.absolute.uri.toFilePath()]);
   }
 
   var environmentName = env['ANGEL_ENV'] ?? 'development';

packages/configuration/pubspec.yaml

@@ -8,7 +8,7 @@ environment:
 dependencies:
   angel3_framework: ^7.0.0
   belatuk_merge_map: ^4.0.0
-  dotenv: ^3.0.0
+  dotenv: ^4.0.0
   file: ^6.1.0
   yaml: ^3.1.0
 dev_dependencies:

packages/cors/pubspec.yaml

@@ -1,37 +1,37 @@
 name: angel3_cors
-version: 6.0.1
+version: 7.0.0
 description: Angel3 CORS middleware. Ported from expressjs/cors to Angel3 framework.
 homepage: https://angel3-framework.web.app/
 repository: https://github.com/dukefirehawk/angel/tree/master/packages/cors
 environment:
   sdk: '>=2.17.0 <3.0.0'
 dependencies: 
-  angel3_framework: ^6.0.0
+  angel3_framework: ^7.0.0
 dev_dependencies:
-  angel3_test: ^6.0.0
+  angel3_test: ^7.0.0
   http: ^0.13.3
   lints: ^2.0.0
   test: ^1.21.0
-# dependency_overrides:
-#   angel3_container:
-#     path: ../container/angel_container
-#   angel3_framework:
-#     path: ../framework
-#   angel3_http_exception:
-#     path: ../http_exception
-#   angel3_model:
-#     path: ../model
-#   angel3_route:
-#     path: ../route
-#   angel3_mock_request:
-#     path: ../mock_request
-#   angel3_auth:
-#     path: ../auth
-#   angel3_client:
-#     path: ../client
-#   angel3_websocket:
-#     path: ../websocket
-#   angel3_validate:
-#     path: ../validate
-#   angel3_test:
-#     path: ../test
+dependency_overrides:
+  angel3_container:
+    path: ../container/angel_container
+  angel3_framework:
+    path: ../framework
+  angel3_http_exception:
+    path: ../http_exception
+  angel3_model:
+    path: ../model
+  angel3_route:
+    path: ../route
+  angel3_mock_request:
+    path: ../mock_request
+  angel3_auth:
+    path: ../auth
+  angel3_client:
+    path: ../client
+  angel3_websocket:
+    path: ../websocket
+  angel3_validate:
+    path: ../validate
+  angel3_test:
+    path: ../test

packages/file_service/pubspec.yaml

@@ -1,27 +1,27 @@
 name: angel3_file_service
-version: 6.0.0
+version: 7.0.0
 description: Angel service that persists data to a file on disk, stored as a JSON list.
 homepage: https://angel3-framework.web.app/
 repository: https://github.com/dukefirehawk/angel/tree/master/packages/file_service
 environment:
   sdk: '>=2.17.0 <3.0.0'
 dependencies:
-  angel3_framework: ^6.0.0
+  angel3_framework: ^7.0.0
   file: ^6.1.1
   pool: ^1.5.0
 dev_dependencies:
   test: ^1.21.0
   lints: ^2.0.0
-# dependency_overrides:
-#   angel3_container:
-#     path: ../container/angel_container
-#   angel3_framework:
-#     path: ../framework
-#   angel3_http_exception:
-#     path: ../http_exception
-#   angel3_model:
-#     path: ../model
-#   angel3_route:
-#     path: ../route
-#   angel3_mock_request:
-#     path: ../mock_request
+dependency_overrides:
+  angel3_container:
+    path: ../container/angel_container
+  angel3_framework:
+    path: ../framework
+  angel3_http_exception:
+    path: ../http_exception
+  angel3_model:
+    path: ../model
+  angel3_route:
+    path: ../route
+  angel3_mock_request:
+    path: ../mock_request

packages/hot/CHANGELOG.md

@@ -1,8 +1,13 @@
 # Change Log
 
+## 7.0.0
+
+* Updated to min SDK 2.17.x
+* Updated `vm_service` to 9.3.0
+
 ## 6.0.0
 
-* Updated to SDK 2.16.x
+* Updated to min SDK 2.16.x
 
 ## 5.0.0
 

packages/hot/pubspec.yaml

@@ -1,41 +1,41 @@
 name: angel3_hot
-version: 6.0.0
+version: 7.0.0
 description: Supports hot reloading/hot code push of Angel3 servers on file changes.
 homepage: https://angel3-framework.web.app/
 repository: https://github.com/dukefirehawk/angel/tree/master/packages/hot
 environment:
   sdk: '>=2.17.0 <3.0.0'
 dependencies:
-  angel3_framework: ^6.0.0
-  angel3_websocket: ^6.0.0
-  belatuk_html_builder: ^3.0.0
+  angel3_framework: ^7.0.0
+  angel3_websocket: ^7.0.0
+  belatuk_html_builder: ^4.0.0
   charcode: ^1.2.0
   glob: ^2.0.1
   io: ^1.0.0
   path: ^1.8.0
-  vm_service: ^8.1.0
+  vm_service: ^9.3.0
   watcher: ^1.0.0
 dev_dependencies:
   http: ^0.13.2
   logging: ^1.0.1
   lints: ^2.0.0
-# dependency_overrides:
-#   angel3_container:
-#     path: ../container/angel_container
-#   angel3_framework:
-#     path: ../framework
-#   angel3_http_exception:
-#     path: ../http_exception
-#   angel3_model:
-#     path: ../model
-#   angel3_route:
-#     path: ../route
-#   angel3_mock_request:
-#     path: ../mock_request
-#   angel3_auth:
-#     path: ../auth
-#   angel3_client:
-#     path: ../client
-#   angel3_websocket:
-#     path: ../websocket
+dependency_overrides:
+  angel3_container:
+    path: ../container/angel_container
+  angel3_framework:
+    path: ../framework
+  angel3_http_exception:
+    path: ../http_exception
+  angel3_model:
+    path: ../model
+  angel3_route:
+    path: ../route
+  angel3_mock_request:
+    path: ../mock_request
+  angel3_auth:
+    path: ../auth
+  angel3_client:
+    path: ../client
+  angel3_websocket:
+    path: ../websocket
  

packages/html/pubspec.yaml

@@ -1,39 +1,39 @@
 name: angel3_html
-version: 6.0.0
+version: 7.0.0
 description: Support for rendering html_builder AST's as responses in Angel.
 homepage: https://angel3-framework.web.app/
 repository: https://github.com/dukefirehawk/angel/tree/angel3/packages/html_builder
 environment:
   sdk: '>=2.17.0 <3.0.0'
 dependencies:
-  angel3_framework: ^6.0.0
-  belatuk_html_builder: ^3.0.0
+  angel3_framework: ^7.0.0
+  belatuk_html_builder: ^4.0.0
 dev_dependencies:
-  angel3_test: ^6.0.0
+  angel3_test: ^7.0.0
   html: ^0.15.0
   logging: ^1.0.1
   test: ^1.21.0
   lints: ^2.0.0
-# dependency_overrides:
-#   angel3_container:
-#     path: ../container/angel_container
-#   angel3_framework:
-#     path: ../framework
-#   angel3_test:
-#     path: ../test
-#   angel3_websocket:
-#     path: ../websocket
-#   angel3_http_exception:
-#     path: ../http_exception
-#   angel3_client:
-#     path: ../client
-#   angel3_auth:
-#     path: ../auth 
-#   angel3_validate:
-#     path: ../validate
-#   angel3_mock_request:
-#     path: ../mock_request
-#   angel3_model:
-#     path: ../model
-#   angel3_route:
-#     path: ../route
+dependency_overrides:
+  angel3_container:
+    path: ../container/angel_container
+  angel3_framework:
+    path: ../framework
+  angel3_test:
+    path: ../test
+  angel3_websocket:
+    path: ../websocket
+  angel3_http_exception:
+    path: ../http_exception
+  angel3_client:
+    path: ../client
+  angel3_auth:
+    path: ../auth 
+  angel3_validate:
+    path: ../validate
+  angel3_mock_request:
+    path: ../mock_request
+  angel3_model:
+    path: ../model
+  angel3_route:
+    path: ../route

packages/jael/angel_jael/pubspec.yaml

@@ -1,47 +1,47 @@
 name: angel3_jael
-version: 6.0.1
+version: 7.0.0
 description: Angel support for the Jael templating engine, similar to Blade or Liquid.
 homepage: https://angel3-framework.web.app/
 repository: https://github.com/dukefirehawk/angel/tree/master/packages/jael/angel_jael
 environment:
   sdk: '>=2.17.0 <3.0.0'
 dependencies:
-  angel3_framework: ^6.0.0
-  jael3: ^6.0.0
-  jael3_preprocessor: ^6.0.0
-  belatuk_code_buffer: ^3.0.0
-  belatuk_symbol_table: ^3.0.0
+  angel3_framework: ^7.0.0
+  jael3: ^7.0.0
+  jael3_preprocessor: ^7.0.0
+  belatuk_code_buffer: ^4.0.0
+  belatuk_symbol_table: ^4.0.0
   file: ^6.0.0
   logging: ^1.0.1
 dev_dependencies:
-  angel3_test: ^6.0.0
+  angel3_test: ^7.0.0
   html: ^0.15.0
   test: ^1.21.0
   lints: ^2.0.0
-# dependency_overrides:
-#   angel3_container:
-#     path: ../../container/angel_container
-#   angel3_framework:
-#     path: ../../framework
-#   angel3_http_exception:
-#     path: ../../http_exception
-#   angel3_model:
-#     path: ../../model
-#   angel3_route:
-#     path: ../../route
-#   angel3_mock_request:
-#     path: ../../mock_request
-#   angel3_auth:
-#     path: ../../auth 
-#   angel3_client:
-#     path: ../../client
-#   angel3_websocket:
-#     path: ../../websocket
-#   angel3_validate:
-#     path: ../../validate
-#   angel3_test:
-#     path: ../../test
-#   jael3:
-#     path: ../jael
-#   jael3_preprocessor:
-#     path: ../jael_preprocessor
+dependency_overrides:
+  angel3_container:
+    path: ../../container/angel_container
+  angel3_framework:
+    path: ../../framework
+  angel3_http_exception:
+    path: ../../http_exception
+  angel3_model:
+    path: ../../model
+  angel3_route:
+    path: ../../route
+  angel3_mock_request:
+    path: ../../mock_request
+  angel3_auth:
+    path: ../../auth 
+  angel3_client:
+    path: ../../client
+  angel3_websocket:
+    path: ../../websocket
+  angel3_validate:
+    path: ../../validate
+  angel3_test:
+    path: ../../test
+  jael3:
+    path: ../jael
+  jael3_preprocessor:
+    path: ../jael_preprocessor

packages/jael/jael/pubspec.yaml

@@ -1,5 +1,5 @@
 name: jael3
-version: 6.0.1
+version: 7.0.0
 description:  A simple server-side HTML templating engine for Dart. Comparable to Blade or Liquid.
 homepage: https://angel3-framework.web.app/
 repository: https://github.com/dukefirehawk/angel/tree/master/packages/jael/jael
@@ -8,8 +8,8 @@ environment:
 dependencies:
   args: ^2.0.0
   charcode: ^1.0.0
-  belatuk_code_buffer: ^3.0.0
-  belatuk_symbol_table: ^3.0.0
+  belatuk_code_buffer: ^4.0.0
+  belatuk_symbol_table: ^4.0.0
   source_span: ^1.0.0
   string_scanner: ^1.0.0
   collection: ^1.15.0

packages/jael/jael_language_server/pubspec.yaml

@@ -1,5 +1,5 @@
 name: jael3_language_server
-version: 6.0.0
+version: 7.0.0
 description: Language Server Protocol implementation for the Jael templating engine.
 homepage: https://github.com/angel-dart/vscode
 publish_to: none
@@ -10,15 +10,19 @@ dependencies:
 #  dart_language_server: ^0.1.16
   file: ^6.1.2
   io: ^1.0.0
-  jael3: ^6.0.0
-  jael3_preprocessor: ^6.0.0
+  jael3: ^7.0.0
+  jael3_preprocessor: ^7.0.0
   json_rpc_2: ^3.0.1
   logging: ^1.0.1
   path: ^1.8.0
   source_span: ^1.8.1
   string_scanner: ^1.1.0
-  belatuk_symbol_table: ^3.0.0
+  belatuk_symbol_table: ^4.0.0
   lints: ^2.0.0
 executables:
   jael3_language_server: jael3_language_server
-  
+dependency_overrides:
+  jael3:
+    path: ../jael
+  jael3_preprocessor:
+    path: ../jael_preprocessor

packages/jael/jael_preprocessor/pubspec.yaml

@@ -1,5 +1,5 @@
 name: jael3_preprocessor
-version: 6.0.1
+version: 7.0.0
 description: A pre-processor for resolving blocks and includes within Jael templates.
 homepage: https://angel3-framework.web.app/
 repository: https://github.com/dukefirehawk/angel/tree/master/packages/jael/jael_preprocessor
@@ -7,13 +7,13 @@ environment:
   sdk: '>=2.17.0 <3.0.0'
 dependencies:
   file: ^6.1.0
-  jael3: ^6.0.0
-  belatuk_symbol_table: ^3.0.0
+  jael3: ^7.0.0
+  belatuk_symbol_table: ^4.0.0
   collection: ^1.15.0
 dev_dependencies:
-  belatuk_code_buffer: ^3.0.0
+  belatuk_code_buffer: ^4.0.0
   test: ^1.21.0
   lints: ^2.0.0
-# dependency_overrides:
-#   jael3:
-#     path: ../jael
+dependency_overrides:
+  jael3:
+    path: ../jael

packages/jinja/pubspec.yaml

@@ -1,14 +1,37 @@
 name: angel3_jinja
-version: 6.0.0
+version: 7.0.0
 description: A service that renders Jinja2 template into HTML view for Angel3. Ported from Python to Dart.
 homepage: https://github.com/dukefirehawk/angel/tree/master/packages/jinja
 environment:
   sdk: '>=2.17.0 <3.0.0'
 dependencies:
-  angel3_framework: ^6.0.0
+  angel3_framework: ^7.0.0
   jinja: ^0.3.4
 dev_dependencies:
-  angel3_test: ^6.0.0
+  angel3_test: ^7.0.0
   path: ^1.8.0
   test: ^1.21.0
-  lints: ^2.0.0
+  lints: ^2.0.0
+dependency_overrides:
+  angel3_container:
+    path: ../container/angel_container
+  angel3_framework:
+    path: ../framework
+  angel3_http_exception:
+    path: ../http_exception
+  angel3_model:
+    path: ../model
+  angel3_route:
+    path: ../route
+  angel3_mock_request:
+    path: ../mock_request
+  angel3_test:
+    path: ../test
+  angel3_websocket:
+    path: ../websocket
+  angel3_client:
+    path: ../client
+  angel3_auth:
+    path: ../auth
+  angel3_validate:
+    path: ../validate

packages/markdown/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## 7.0.0
+
+* Updated to min SDK 2.17.x
+* Updated `markdown` to 6.0.x
+
 ## 6.1.0
 
 * Updated `markdown` to 5.x.x

packages/markdown/pubspec.yaml

@@ -1,15 +1,38 @@
 name: angel3_markdown
-version: 6.1.0
+version: 7.0.0
 description: Angel3 Markdown view generator. Write static sites, with no build step.
 homepage: https://angel3-framework.web.app/
 repository: https://github.com/dukefirehawk/angel/tree/master/packages/markdown
 environment:
   sdk: '>=2.17.0 <3.0.0'
 dependencies:
-  angel3_framework: ^6.0.0
+  angel3_framework: ^7.0.0
   file: ^6.1.2
-  markdown: ^5.0.0
+  markdown: ^6.0.0
 dev_dependencies:
-  angel3_test: ^6.0.0
+  angel3_test: ^7.0.0
   lints: ^2.0.0
   test: ^1.21.0
+dependency_overrides:
+  angel3_container:
+    path: ../container/angel_container
+  angel3_framework:
+    path: ../framework
+  angel3_http_exception:
+    path: ../http_exception
+  angel3_model:
+    path: ../model
+  angel3_route:
+    path: ../route
+  angel3_mock_request:
+    path: ../mock_request
+  angel3_test:
+    path: ../test
+  angel3_websocket:
+    path: ../websocket
+  angel3_client:
+    path: ../client
+  angel3_auth:
+    path: ../auth
+  angel3_validate:
+    path: ../validate

packages/mongo/pubspec.yaml

@@ -1,29 +1,29 @@
 name: angel3_mongo
-version: 6.0.0
+version: 7.0.0
 description: MongoDB-enabled services for the Angel3 framework. Well-tested.
 homepage: https://angel3-framework.web.app/
 repository: https://github.com/dukefirehawk/angel/tree/master/packages/mongo
 environment:
   sdk: '>=2.17.0 <3.0.0'
 dependencies:
-  angel3_framework: ^6.0.0
-  belatuk_json_serializer: ^5.0.0
-  belatuk_merge_map: ^3.0.0
+  angel3_framework: ^7.0.0
+  belatuk_json_serializer: ^6.0.0
+  belatuk_merge_map: ^4.0.0
   mongo_dart: ^0.7.0
 dev_dependencies:
   http: ^0.13.0
   test: ^1.21.0
   lints: ^2.0.0
-# dependency_overrides:
-#   angel3_container:
-#     path: ../container/angel_container
-#   angel3_framework:
-#     path: ../framework
-#   angel3_http_exception:
-#     path: ../http_exception
-#   angel3_model:
-#     path: ../model
-#   angel3_route:
-#     path: ../route
-#   angel3_mock_request:
-#     path: ../mock_request
+dependency_overrides:
+  angel3_container:
+    path: ../container/angel_container
+  angel3_framework:
+    path: ../framework
+  angel3_http_exception:
+    path: ../http_exception
+  angel3_model:
+    path: ../model
+  angel3_route:
+    path: ../route
+  angel3_mock_request:
+    path: ../mock_request

packages/mustache/pubspec.yaml

@@ -1,12 +1,12 @@
 name: angel3_mustache
-version: 6.0.0
+version: 7.0.0
 description: A service that renders Mustache template into HTML view for Angel3
 homepage: https://angel3-framework.web.app/
 repository: https://github.com/dukefirehawk/angel/tree/master/packages/mustache
 environment:
   sdk: '>=2.17.0 <3.0.0'
 dependencies:
-  angel3_framework: ^6.0.0
+  angel3_framework: ^7.0.0
   file: ^6.1.2
   mustache_template: ^2.0.0
   path: ^1.8.0
@@ -14,3 +14,16 @@ dev_dependencies:
   http: ^0.13.3
   test: ^1.21.0
   lints: ^2.0.0
+dependency_overrides:
+  angel3_container:
+    path: ../container/angel_container
+  angel3_framework:
+    path: ../framework
+  angel3_http_exception:
+    path: ../http_exception
+  angel3_model:
+    path: ../model
+  angel3_route:
+    path: ../route
+  angel3_mock_request:
+    path: ../mock_request

packages/oauth2/pubspec.yaml

@@ -1,20 +1,43 @@
 name: angel3_oauth2
-version: 6.0.1
+version: 7.0.0
 description: A class containing handlers that can be used within Angel to build a spec-compliant OAuth 2.0 server.
 homepage: https://angel3-framework.web.app/
 repository: https://github.com/dukefirehawk/angel/tree/master/packages/oauth2
 environment:
   sdk: '>=2.17.0 <3.0.0'
 dependencies: 
-  angel3_framework: ^6.0.0
-  angel3_http_exception: ^6.0.0
+  angel3_framework: ^7.0.0
+  angel3_http_exception: ^7.0.0
   crypto: ^3.0.1
   collection: ^1.15.0
 dev_dependencies: 
-  angel3_validate: ^6.0.0
-  angel3_test: ^6.0.0
+  angel3_validate: ^7.0.0
+  angel3_test: ^7.0.0
   logging: ^1.0.1
   oauth2: ^2.0.0
   lints: ^2.0.0
   test: ^1.21.0
   uuid: ^3.0.4
+dependency_overrides:
+  angel3_container:
+    path: ../container/angel_container
+  angel3_framework:
+    path: ../framework
+  angel3_http_exception:
+    path: ../http_exception
+  angel3_model:
+    path: ../model
+  angel3_route:
+    path: ../route
+  angel3_mock_request:
+    path: ../mock_request
+  angel3_test:
+    path: ../test
+  angel3_validate:
+    path: ../validate
+  angel3_websocket:
+    path: ../websocket
+  angel3_client:
+    path: ../client
+  angel3_auth:
+    path: ../auth

packages/orm/angel_migration_runner/pubspec.yaml

@@ -1,13 +1,13 @@
 name: angel3_migration_runner
-version: 6.1.0
+version: 7.0.0
 description: Command-line based database migration runner for Angel3's ORM.
 homepage: https://angel3-framework.web.app/
 repository: https://github.com/dukefirehawk/angel/tree/master/packages/orm/angel_migration_runner
 environment:
   sdk: '>=2.17.0 <3.0.0'
 dependencies:
-  angel3_migration: ^6.0.0
-  angel3_orm: ^6.0.0
+  angel3_migration: ^7.0.0
+  angel3_orm: ^7.0.0
   args: ^2.1.0
   charcode: ^1.2.0
   postgres: ^2.4.0
@@ -16,8 +16,8 @@ dependencies:
   logging: ^1.0.0
 dev_dependencies:
   lints: ^2.0.0
-# dependency_overrides:
-#    angel3_orm:
-#      path: ../angel_orm
-#    angel3_migration:
-#      path: ../angel_migration
+dependency_overrides:
+   angel3_orm:
+     path: ../angel_orm
+   angel3_migration:
+     path: ../angel_migration

packages/orm/angel_orm_generator/pubspec.yaml

@@ -1,15 +1,15 @@
 name: angel3_orm_generator
-version: 6.2.0
+version: 7.0.0
 description: Code generators for Angel3 ORM. Generates query builder classes.
 homepage: https://angel3-framework.web.app/
 repository: https://github.com/dukefirehawk/angel/tree/master/packages/orm/angel_orm_generator
 environment:
   sdk: '>=2.17.0 <3.0.0'
 dependencies:
-  angel3_model: ^6.0.0
-  angel3_serialize: ^6.0.0
-  angel3_orm: ^6.0.0
-  angel3_serialize_generator: ^6.0.0
+  angel3_model: ^7.0.0
+  angel3_serialize: ^7.0.0
+  angel3_orm: ^7.0.0
+  angel3_serialize_generator: ^7.0.0
   analyzer: ^4.0.0
   inflection3: ^0.5.3+1
   build: ^2.0.1
@@ -24,31 +24,31 @@ dependencies:
   logging: ^1.0.0
   optional: ^6.0.0
 dev_dependencies:
-  angel3_framework: ^6.0.0
-  angel3_migration: ^6.0.0
+  angel3_framework: ^7.0.0
+  angel3_migration: ^7.0.0
   build_runner: ^2.0.1
   postgres: ^2.4.0
   test: ^1.21.0
   lints: ^2.0.0
-# dependency_overrides:
-#   angel3_container:
-#     path: ../../container/angel_container
-#   angel3_framework:
-#     path: ../../framework
-#   angel3_http_exception:
-#     path: ../../http_exception
-#   angel3_model:
-#     path: ../../model
-#   angel3_route:
-#     path: ../../route
-#   angel3_mock_request:
-#     path: ../../mock_request
-#   angel3_serialize:
-#     path: ../../serialize/angel_serialize
-  # angel3_serialize_generator:
-  #   path: ../../serialize/angel_serialize_generator
-  # angel3_orm:
-  #   path: ../angel_orm
-  # angel3_migration:
-  #   path: ../angel_migration
+dependency_overrides:
+  angel3_container:
+    path: ../../container/angel_container
+  angel3_framework:
+    path: ../../framework
+  angel3_http_exception:
+    path: ../../http_exception
+  angel3_model:
+    path: ../../model
+  angel3_route:
+    path: ../../route
+  angel3_mock_request:
+    path: ../../mock_request
+  angel3_serialize:
+    path: ../../serialize/angel_serialize
+  angel3_serialize_generator:
+    path: ../../serialize/angel_serialize_generator
+  angel3_orm:
+    path: ../angel_orm
+  angel3_migration:
+    path: ../angel_migration
  

packages/orm/angel_orm_mysql/pubspec.yaml

@@ -1,34 +1,34 @@
 name: angel3_orm_mysql
-version: 6.0.0
+version: 7.0.0
 description: MySQL support for Angel3 ORM. Includes functionality for querying and transactions.
 homepage: https://angel3-framework.web.app/
 repository: https://github.com/dukefirehawk/angel/tree/master/packages/orm/angel_orm_mysql
 environment:
   sdk: '>=2.17.0 <3.0.0'
 dependencies:
-  angel3_orm: ^6.0.0
+  angel3_orm: ^7.0.0
   logging: ^1.0.0
   mysql1: ^0.20.0
   mysql_client: ^0.0.24
   optional: ^6.0.0
 dev_dependencies:
-  angel3_orm_generator: ^6.0.0
-  angel3_orm_test: ^6.0.0
+  angel3_orm_generator: ^7.0.0
+  angel3_orm_test: ^7.0.0
   build_runner: ^2.0.1
   test: ^1.21.0
   lints: ^2.0.0
-# dependency_overrides:
-#   angel3_serialize:
-#     path: ../../serialize/angel_serialize
-#   angel3_serialize_generator:
-#     path: ../../serialize/angel_serialize_generator
-#   angel3_model:
-#     path: ../../model
-  # angel3_orm_test:
-  #   path: ../angel_orm_test
-  # angel3_orm:
-  #   path: ../angel_orm
-#   angel3_orm_generator:
-#     path: ../angel_orm_generator
-  # angel3_migration:
-  #   path: ../angel_migration
+dependency_overrides:
+  angel3_serialize:
+    path: ../../serialize/angel_serialize
+  angel3_serialize_generator:
+    path: ../../serialize/angel_serialize_generator
+  angel3_model:
+    path: ../../model
+  angel3_orm_test:
+    path: ../angel_orm_test
+  angel3_orm:
+    path: ../angel_orm
+  angel3_orm_generator:
+    path: ../angel_orm_generator
+  angel3_migration:
+    path: ../angel_migration

packages/orm/angel_orm_postgres/pubspec.yaml

@@ -1,29 +1,29 @@
 name: angel3_orm_postgres
-version: 6.1.0
+version: 7.0.0
 description: PostgreSQL support for Angel3 ORM. Includes functionality for querying and transactions.
 homepage: https://angel3-framework.web.app/
 repository: https://github.com/dukefirehawk/angel/tree/master/packages/orm/angel_orm_postgres
 environment:
   sdk: '>=2.17.0 <3.0.0'
 dependencies:
-  angel3_orm: ^6.0.0
+  angel3_orm: ^7.0.0
   logging: ^1.0.1
   pool: ^1.5.0
   postgres: ^2.4.1
   postgres_pool: ^2.1.3
 dev_dependencies:
-  belatuk_pretty_logging: ^4.0.0
-  angel3_orm_test: ^6.0.0
+  belatuk_pretty_logging: ^5.0.0
+  angel3_orm_test: ^7.0.0
   test: ^1.21.0
   lints: ^2.0.0
-# dependency_overrides:
-#   angel3_serialize:
-#      path: ../../serialize/angel_serialize
-#   angel3_model:
-#     path: ../../model
-  # angel3_orm_test:
-  #    path: ../angel_orm_test
-  # angel3_orm:
-  #    path: ../angel_orm
-  # angel3_migration:
-  #    path: ../angel_migration
+dependency_overrides:
+  angel3_serialize:
+     path: ../../serialize/angel_serialize
+  angel3_model:
+    path: ../../model
+  angel3_orm_test:
+     path: ../angel_orm_test
+  angel3_orm:
+     path: ../angel_orm
+  angel3_migration:
+     path: ../angel_migration

packages/orm/angel_orm_service/pubspec.yaml

@@ -1,52 +1,52 @@
 name: angel3_orm_service
-version: 6.0.0
+version: 7.0.0
 description: Service implementation that wraps over Angel3 ORM Query classes.
 homepage: https://angel3-framework.web.app/
 repository: https://github.com/dukefirehawk/angel/tree/master/packages/orm/angel_orm_service
 environment:
   sdk: '>=2.17.0 <3.0.0'
 dependencies:
-  angel3_framework: ^6.0.0
-  angel3_orm: ^6.0.0
+  angel3_framework: ^7.0.0
+  angel3_orm: ^7.0.0
   postgres: ^2.4.0
   optional: ^6.0.0
 dev_dependencies:
-  angel3_migration: ^6.0.0
-  angel3_migration_runner: ^6.0.0
-  angel3_orm_generator: ^6.0.0
-  angel3_orm_postgres: ^6.0.0
-  angel3_serialize: ^6.0.0
-  #angel3_orm_test: ^3.0.0
+  angel3_migration: ^7.0.0
+  angel3_migration_runner: ^7.0.0
+  angel3_orm_generator: ^7.0.0
+  angel3_orm_postgres: ^7.0.0
+  angel3_serialize: ^7.0.0
+  #angel3_orm_test: ^7.0.0
   build_runner: ^2.0.4
   logging: ^1.0.1
   test: ^1.21.0
   lints: ^2.0.0
-# dependency_overrides:
-#   angel3_container:
-#     path: ../../container/angel_container
-#   angel3_framework:
-#     path: ../../framework
-#   angel3_http_exception:
-#     path: ../../http_exception
-#   angel3_model:
-#     path: ../../model
-#   angel3_route:
-#     path: ../../route
-#   angel3_mock_request:
-#     path: ../../mock_request
-#   angel3_serialize:
-#     path: ../../serialize/angel_serialize
-#   angel3_serialize_generator:
-#     path: ../../serialize/angel_serialize_generator
-#   angel3_orm_test:
-#     path: ../angel_orm_test
-#   angel3_orm:
-#     path: ../angel_orm
-#   angel3_orm_generator:
-#     path: ../angel_orm_generator
-#   angel3_orm_postgres:
-#     path: ../angel_orm_postgres
-#   angel3_migration:
-#     path: ../angel_migration
-#   angel3_migration_runner:
-#     path: ../angel_migration_runner
+dependency_overrides:
+  angel3_container:
+    path: ../../container/angel_container
+  angel3_framework:
+    path: ../../framework
+  angel3_http_exception:
+    path: ../../http_exception
+  angel3_model:
+    path: ../../model
+  angel3_route:
+    path: ../../route
+  angel3_mock_request:
+    path: ../../mock_request
+  angel3_serialize:
+    path: ../../serialize/angel_serialize
+  angel3_serialize_generator:
+    path: ../../serialize/angel_serialize_generator
+  angel3_orm_test:
+    path: ../angel_orm_test
+  angel3_orm:
+    path: ../angel_orm
+  angel3_orm_generator:
+    path: ../angel_orm_generator
+  angel3_orm_postgres:
+    path: ../angel_orm_postgres
+  angel3_migration:
+    path: ../angel_migration
+  angel3_migration_runner:
+    path: ../angel_migration_runner

packages/orm/angel_orm_test/pubspec.yaml

@@ -1,44 +1,44 @@
 name: angel3_orm_test
-version: 6.1.0
+version: 7.0.0
 description: Common tests for Angel3 ORM. Reference implmentation of the generated ORM files.
 homepage: https://angel3-framework.web.app/
 repository: https://github.com/dukefirehawk/angel/tree/master/packages/orm/angel_orm_test
 environment:
   sdk: '>=2.17.0 <3.0.0'
 dependencies:
-  angel3_migration: ^6.0.0
-  angel3_model: ^6.0.0
-  angel3_orm: ^6.0.0
-  angel3_serialize: ^6.0.0
+  angel3_migration: ^7.0.0
+  angel3_model: ^7.0.0
+  angel3_orm: ^7.0.0
+  angel3_serialize: ^7.0.0
   io: ^1.0.0
   test: ^1.21.0
   collection: ^1.15.0
   optional: ^6.0.0
 dev_dependencies:
-  angel3_orm_generator: ^6.0.0
-  angel3_framework: ^6.0.0
+  angel3_orm_generator: ^7.0.0
+  angel3_framework: ^7.0.0
   build_runner: ^2.0.1
   lints: ^2.0.0
-# dependency_overrides:
-  # angel3_container:
-  #   path: ../../container/angel_container
-  # angel3_framework:
-  #   path: ../../framework
-  # angel3_http_exception:
-  #   path: ../../http_exception
-  # angel3_model:
-  #   path: ../../model
-  # angel3_route:
-  #   path: ../../route
-  # angel3_mock_request:
-  #   path: ../../mock_request
-  # angel3_serialize:
-  #   path: ../../serialize/angel_serialize
-  # angel3_serialize_generator:
-  #    path: ../../serialize/angel_serialize_generator
-  # angel3_orm:
-  #    path: ../angel_orm
-  # angel3_migration:
-  #    path: ../angel_migration
-  # angel3_orm_generator:
-  #    path: ../angel_orm_generator
+dependency_overrides:
+  angel3_container:
+    path: ../../container/angel_container
+  angel3_framework:
+    path: ../../framework
+  angel3_http_exception:
+    path: ../../http_exception
+  angel3_model:
+    path: ../../model
+  angel3_route:
+    path: ../../route
+  angel3_mock_request:
+    path: ../../mock_request
+  angel3_serialize:
+    path: ../../serialize/angel_serialize
+  angel3_serialize_generator:
+     path: ../../serialize/angel_serialize_generator
+  angel3_orm:
+     path: ../angel_orm
+  angel3_migration:
+     path: ../angel_migration
+  angel3_orm_generator:
+     path: ../angel_orm_generator