From 718f444bc3c419de139371e39c548eecedc2d14b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Sharma?=
 <737941+loic-sharma@users.noreply.github.com>
Date: Wed, 17 May 2023 16:07:16 -0700
Subject: [PATCH] [Windows] Improve version migration message (#127048)

This also migrates the platform channel example to stamp version information on Windows.
---
 examples/platform_channel/windows/runner/Runner.rc     | 10 +++++-----
 .../lib/src/windows/migrations/version_migration.dart  |  2 +-
 .../windows/migrations/version_migration_test.dart     |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/examples/platform_channel/windows/runner/Runner.rc b/examples/platform_channel/windows/runner/Runner.rc
index 9e4b2c23aeb..7f604a7b067 100644
--- a/examples/platform_channel/windows/runner/Runner.rc
+++ b/examples/platform_channel/windows/runner/Runner.rc
@@ -50,14 +50,14 @@ END
 // Version
 //
 
-#ifdef FLUTTER_BUILD_NUMBER
-#define VERSION_AS_NUMBER FLUTTER_BUILD_NUMBER
+#if defined(FLUTTER_VERSION_MAJOR) && defined(FLUTTER_VERSION_MINOR) && defined(FLUTTER_VERSION_PATCH) && defined(FLUTTER_VERSION_BUILD)
+#define VERSION_AS_NUMBER FLUTTER_VERSION_MAJOR,FLUTTER_VERSION_MINOR,FLUTTER_VERSION_PATCH,FLUTTER_VERSION_BUILD
 #else
-#define VERSION_AS_NUMBER 1,0,0
+#define VERSION_AS_NUMBER 1,0,0,0
 #endif
 
-#ifdef FLUTTER_BUILD_NAME
-#define VERSION_AS_STRING #FLUTTER_BUILD_NAME
+#if defined(FLUTTER_VERSION)
+#define VERSION_AS_STRING FLUTTER_VERSION
 #else
 #define VERSION_AS_STRING "1.0.0"
 #endif
diff --git a/packages/flutter_tools/lib/src/windows/migrations/version_migration.dart b/packages/flutter_tools/lib/src/windows/migrations/version_migration.dart
index 5745e0773a7..b0fed0b4e8f 100644
--- a/packages/flutter_tools/lib/src/windows/migrations/version_migration.dart
+++ b/packages/flutter_tools/lib/src/windows/migrations/version_migration.dart
@@ -115,7 +115,7 @@ This indicates non-trivial changes have been made to the Windows runner in the
     );
     if (originalResourceFileContents != newResourceFileContents) {
       logger.printStatus(
-        'windows/runner/Runner.rc does not define use Flutter version information, updating.',
+        'windows/runner/Runner.rc does not use Flutter version information, updating.',
       );
       _resourceFile.writeAsStringSync(newResourceFileContents);
     }
diff --git a/packages/flutter_tools/test/general.shard/windows/migrations/version_migration_test.dart b/packages/flutter_tools/test/general.shard/windows/migrations/version_migration_test.dart
index 3885ba7c920..ed972a81416 100644
--- a/packages/flutter_tools/test/general.shard/windows/migrations/version_migration_test.dart
+++ b/packages/flutter_tools/test/general.shard/windows/migrations/version_migration_test.dart
@@ -246,7 +246,7 @@ void main () {
       );
 
       expect(testLogger.statusText, contains('windows/runner/CMakeLists.txt does not define version information, updating.'));
-      expect(testLogger.statusText, contains('windows/runner/Runner.rc does not define use Flutter version information, updating.'));
+      expect(testLogger.statusText, contains('windows/runner/Runner.rc does not use Flutter version information, updating.'));
     });
 
     testWithoutContext('migrates project to set version information (CRLF)', () {
@@ -308,7 +308,7 @@ void main () {
       );
 
       expect(testLogger.statusText, contains('windows/runner/CMakeLists.txt does not define version information, updating.'));
-      expect(testLogger.statusText, contains('windows/runner/Runner.rc does not define use Flutter version information, updating.'));
+      expect(testLogger.statusText, contains('windows/runner/Runner.rc does not use Flutter version information, updating.'));
     });
   });
 }