Change version to 1.0, remove Preview, and remove forgotten experimen…

…tal settings (#987)
microsoft · May 26, 2021 · 862a2af · 862a2af
1 parent 0604372
commit 862a2af
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 48 deletions.
diff --git a/doc/Settings.md b/doc/Settings.md
@@ -133,43 +133,3 @@ Microsoft Store App support in WinGet is currently implemented as an experimenta
        "experimentalMSStore": true
    },
 ```
-
-### list
-
-While work is in progress on list, the command is hidden behind a feature toggle. One can enable it as below:
-
-```json
-   "experimentalFeatures": {
-       "list": true
-   },
-```
-
-### upgrade
-
-While work is in progress on upgrade, the command is hidden behind a feature toggle. One can enable it as below:
-
-```json
-   "experimentalFeatures": {
-       "upgrade": true
-   },
-```
-
-### uninstall
-
-While work is in progress on uninstall, the command is hidden behind a feature toggle. One can enable it as below:
-
-```json
-   "experimentalFeatures": {
-       "uninstall": true
-   },
-```
-
-### restSource
-
-While work is in progress for rest source support, the feature is hidden behind a feature toggle. Enabling this will not change how client works currently and will allow testing any additional rest sources added. One can enable it as below:
-
-```json
-   "experimentalFeatures": {
-       "restSource": true
-   },
-```
diff --git a/src/AppInstallerCLICore/Command.cpp b/src/AppInstallerCLICore/Command.cpp
@@ -62,7 +62,7 @@ namespace AppInstaller::CLI
     void Command::OutputIntroHeader(Execution::Reporter& reporter) const
     {
         reporter.Info() <<
-            Resource::FixedString::ProductName << " v"_liv << Runtime::GetClientVersion() << ' ' << Resource::String::PreviewVersion << std::endl <<
+            Resource::FixedString::ProductName << " v"_liv << Runtime::GetClientVersion() << std::endl <<
             Resource::String::MainCopyrightNotice << std::endl;
     }
 

diff --git a/src/AppInstallerCLICore/Commands/RootCommand.cpp b/src/AppInstallerCLICore/Commands/RootCommand.cpp
@@ -195,7 +195,7 @@ namespace AppInstaller::CLI
         }
         else if (context.Args.Contains(Execution::Args::Type::ListVersions))
         {
-            context.Reporter.Info() << 'v' << Runtime::GetClientVersion() << ' ' << Resource::String::PreviewVersion;
+            context.Reporter.Info() << 'v' << Runtime::GetClientVersion();
         }
         else
         {

diff --git a/src/AppInstallerCLICore/Resources.h b/src/AppInstallerCLICore/Resources.h
@@ -152,7 +152,6 @@ namespace AppInstaller::CLI::Resource
         WINGET_DEFINE_RESOURCE_STRINGID(PoliciesPolicy);
         WINGET_DEFINE_RESOURCE_STRINGID(PoliciesState);
         WINGET_DEFINE_RESOURCE_STRINGID(PositionArgumentDescription);
-        WINGET_DEFINE_RESOURCE_STRINGID(PreviewVersion);
         WINGET_DEFINE_RESOURCE_STRINGID(PrivacyStatement);
         WINGET_DEFINE_RESOURCE_STRINGID(QueryArgumentDescription);
         WINGET_DEFINE_RESOURCE_STRINGID(RainbowArgumentDescription);

diff --git a/src/AppInstallerCLIPackage/Shared/Strings/en-us/winget.resw b/src/AppInstallerCLIPackage/Shared/Strings/en-us/winget.resw
@@ -419,9 +419,6 @@ They can be configured through the settings file 'winget settings'.</value>
   <data name="PositionArgumentDescription" xml:space="preserve">
     <value>The position of the cursor within the command line</value>
   </data>
-  <data name="PreviewVersion" xml:space="preserve">
-    <value>Preview</value>
-  </data>
   <data name="PrivacyStatement" xml:space="preserve">
     <value>Privacy Statement</value>
   </data>

diff --git a/src/binver/binver/version.h b/src/binver/binver/version.h
@@ -1,8 +1,8 @@
 #define STRINGIZE2(s) #s
 #define STRINGIZE(s) STRINGIZE2(s)
 
-#define VERSION_MAJOR               0
-#define VERSION_MINOR               4
+#define VERSION_MAJOR               1
+#define VERSION_MINOR               0
 #define VERSION_BUILD               0
 #define VERSION_REVISION            0
-Original file line number
+Diff line change
@@ Expand Up / @@ -195,7 +195,7 @@ namespace AppInstaller::CLI @@
             }
             else if (context.Args.Contains(Execution::Args::Type::ListVersions))
             {
-                context.Reporter.Info() << 'v' << Runtime::GetClientVersion() << ' ' << Resource::String::PreviewVersion;
+                context.Reporter.Info() << 'v' << Runtime::GetClientVersion();
             }
             else
             {
@@ Expand Down @@