Merge branch 'main' into win

Author: alexmercerind

packages/device_info_plus/device_info_plus/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 5.0.1
+
+- Fixing federated plugin architecture versions.
+
+## 5.0.0
+
+- Re-introduce: Added more information to `WindowsDeviceInfo`.
+- device_info_plus_platform_interface to 4.0.0
+
 ## 4.1.3
 
 - Detects iOS simulator device id instead of simulator's underlying architecture.

packages/device_info_plus/device_info_plus/example/integration_test/device_info_plus_test.dart

@@ -76,7 +76,7 @@ void main() {
     expect(iosInfo.utsname.version, isNotNull);
   }, skip: !Platform.isIOS);
 
-  testWidgets('Check all android info values are set',
+  testWidgets('Check all android info values are available',
       (WidgetTester tester) async {
     expect(androidInfo.version.baseOS, isNotNull);
     expect(androidInfo.version.codename, isNotNull);
@@ -110,7 +110,7 @@ void main() {
     expect(androidInfo.systemFeatures, isNotNull);
   }, skip: !Platform.isAndroid);
 
-  testWidgets('Check all macos info values are set',
+  testWidgets('Check all macos info values are available',
       ((WidgetTester tester) async {
     expect(macosInfo.computerName, isNotNull);
     expect(macosInfo.hostName, isNotNull);
@@ -137,4 +137,97 @@ void main() {
     expect(linuxInfo.variant, isNull);
     expect(linuxInfo.variantId, isNull);
   }), skip: !Platform.isLinux);
+
+  testWidgets('Check all Windows info values are available',
+      ((WidgetTester tester) async {
+    expect(
+      windowsInfo.numberOfCores,
+      isPositive,
+    );
+    expect(
+      windowsInfo.computerName,
+      isNotEmpty,
+    );
+    expect(
+      windowsInfo.systemMemoryInMegabytes,
+      isPositive,
+    );
+    expect(
+      windowsInfo.userName,
+      isNotEmpty,
+    );
+    expect(
+      windowsInfo.majorVersion,
+      equals(10),
+    );
+    expect(
+      windowsInfo.minorVersion,
+      equals(0),
+    );
+    expect(
+      windowsInfo.buildNumber,
+      greaterThan(10240),
+    );
+    expect(
+      windowsInfo.platformId,
+      equals(2),
+    );
+    expect(
+      windowsInfo.reserved,
+      isZero,
+    );
+    expect(
+      windowsInfo.buildLab,
+      isNotEmpty,
+    );
+    expect(
+      windowsInfo.buildLab,
+      startsWith(
+        windowsInfo.buildNumber.toString(),
+      ),
+    );
+    expect(
+      windowsInfo.buildLabEx,
+      isNotEmpty,
+    );
+    expect(
+      windowsInfo.buildLab,
+      startsWith(windowsInfo.buildNumber.toString()),
+    );
+    expect(
+      windowsInfo.digitalProductId,
+      isNotEmpty,
+    );
+    expect(
+      windowsInfo.editionId,
+      isNotEmpty,
+    );
+    expect(
+      windowsInfo.productId,
+      isNotEmpty,
+    );
+    expect(
+      RegExp(r'^([A-Z0-9]{5}-){4}[A-Z0-9]{5}$')
+              .hasMatch(windowsInfo.productId) ||
+          RegExp(r'^([A-Z0-9]{5}-){3}[A-Z0-9]{5}$')
+              .hasMatch(windowsInfo.productId),
+      isTrue,
+    );
+    expect(
+      windowsInfo.productName,
+      isNotEmpty,
+    );
+    expect(
+      windowsInfo.productName,
+      startsWith('Windows'),
+    );
+    expect(
+      windowsInfo.releaseId,
+      isNotEmpty,
+    );
+    expect(
+      windowsInfo.deviceId,
+      isNotEmpty,
+    );
+  }), skip: !Platform.isWindows);
 }

packages/device_info_plus/device_info_plus/example/lib/main.dart

@@ -176,6 +176,28 @@ class _MyAppState extends State<MyApp> {
       'numberOfCores': data.numberOfCores,
       'computerName': data.computerName,
       'systemMemoryInMegabytes': data.systemMemoryInMegabytes,
+      'userName': data.userName,
+      'majorVersion': data.majorVersion,
+      'minorVersion': data.minorVersion,
+      'buildNumber': data.buildNumber,
+      'platformId': data.platformId,
+      'csdVersion': data.csdVersion,
+      'servicePackMajor': data.servicePackMajor,
+      'servicePackMinor': data.servicePackMinor,
+      'suitMask': data.suitMask,
+      'productType': data.productType,
+      'reserved': data.reserved,
+      'buildLab': data.buildLab,
+      'buildLabEx': data.buildLabEx,
+      'digitalProductId': data.digitalProductId,
+      'displayVersion': data.displayVersion,
+      'editionId': data.editionId,
+      'installDate': data.installDate,
+      'productId': data.productId,
+      'productName': data.productName,
+      'registeredOwner': data.registeredOwner,
+      'releaseId': data.releaseId,
+      'deviceId': data.deviceId,
     };
   }
 

packages/device_info_plus/device_info_plus/pubspec.yaml

@@ -1,7 +1,7 @@
 name: device_info_plus
 description: Flutter plugin providing detailed information about the device
   (make, model, etc.), and Android or iOS version the app is running on.
-version: 4.1.3
+version: 5.0.1
 homepage: https://plus.fluttercommunity.dev/
 repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/
 issue_tracker: https://github.com/fluttercommunity/plus_plugins/labels/device_info_plus
@@ -26,11 +26,11 @@ flutter:
 dependencies:
   flutter:
     sdk: flutter
-  device_info_plus_platform_interface: ^3.0.0
-  device_info_plus_macos: ^3.0.0
-  device_info_plus_linux: ^3.0.0
-  device_info_plus_web: ^3.0.0
-  device_info_plus_windows: ^4.0.0
+  device_info_plus_platform_interface: ^4.0.0
+  device_info_plus_macos: ^4.0.0
+  device_info_plus_linux: ^4.0.0
+  device_info_plus_web: ^4.0.0
+  device_info_plus_windows: ^5.0.0
 
 dev_dependencies:
   flutter_test:

packages/device_info_plus/device_info_plus_linux/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 4.0.0
+
+- platform interface to 4.0.0
+
 ## 3.0.0
 
 - platform interface to 3.0.0

packages/device_info_plus/device_info_plus_linux/pubspec.yaml

@@ -1,6 +1,6 @@
 name: device_info_plus_linux
 description: Linux implementation of the device_info_plus plugin
-version: 3.0.0
+version: 4.0.0
 homepage: https://plus.fluttercommunity.dev/
 repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/
 
@@ -9,7 +9,7 @@ environment:
   flutter: ">=1.20.0"
 
 dependencies:
-  device_info_plus_platform_interface: ^3.0.0
+  device_info_plus_platform_interface: ^4.0.0
   file: ^6.0.0
   flutter:
     sdk: flutter

packages/device_info_plus/device_info_plus_macos/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 4.0.0
+
+- platform interface to 4.0.0
+
 ## 3.0.0
 
 - platform interface to 3.0.0

packages/device_info_plus/device_info_plus_macos/pubspec.yaml

@@ -2,14 +2,14 @@ name: device_info_plus_macos
 description: Macos implementation of the device_info_plus plugin
 homepage: https://plus.fluttercommunity.dev/
 repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/
-version: 3.0.0
+version: 4.0.0
 
 environment:
   sdk: ">=2.12.0 <3.0.0"
   flutter: ">=1.20.0"
 
 dependencies:
-  device_info_plus_platform_interface: ^3.0.0
+  device_info_plus_platform_interface: ^4.0.0
   flutter:
     sdk: flutter
 

packages/device_info_plus/device_info_plus_platform_interface/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 4.0.0
+
+- Re-introduce Windows: Add userName, majorVersion, minorVersion, buildNumber, platformId, csdVersion, servicePackMajor, servicePackMinor, suitMask, productType, reserved, buildLab, buildLabEx, digitalProductId, displayVersion, editionId, installDate, productId, productName, registeredOwner, releaseId, deviceId to WindowsDeviceInfo.
+
 ## 3.0.0
 
 - Redo 2.6.0 into 3.0.0