Merge pull request #30 from dropbox/jack/62

6.0.2 update
dropbox · Jun 12, 2017 · b7e735e · b7e735e
2 parents a66be55 + 242e9cf
commit b7e735e
Show file tree

Hide file tree

Showing 13 changed files with 268 additions and 140 deletions.
diff --git a/Dropbox Business Admin Toolkit Admin Guide.pdf b/Dropbox Business Admin Toolkit Admin Guide.pdf
diff --git a/Installer/DBAdminToolkit.Setup.zip b/Installer/DBAdminToolkit.Setup.zip
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 ![Dropbox Business Admin Toolkit](https://dl.dropboxusercontent.com/u/354544978/MKTG-DEMO/static/dropbox_s.png)
 
-## Release 6.0.1
+## Release 6.0.2
 
 ## Features
 

diff --git a/Source/DBAdminToolkit.Setup/DBAdminToolkit.Setup.vdproj b/Source/DBAdminToolkit.Setup/DBAdminToolkit.Setup.vdproj
@@ -1072,7 +1072,7 @@
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:6.0.1"
+        "ProductVersion" = "8:6.0.2"
         "Manufacturer" = "8:Dropbox Enterprise Services"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"

diff --git a/Source/DfBAdminToolkit.Common/Properties/AssemblyInfo.cs b/Source/DfBAdminToolkit.Common/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("6.0.1.0")]
-[assembly: AssemblyFileVersion("6.0.1.0")]
+[assembly: AssemblyVersion("6.0.2.0")]
+[assembly: AssemblyFileVersion("6.0.2.0")]
diff --git a/Source/DfBAdminToolkit/App.config b/Source/DfBAdminToolkit/App.config
@@ -10,7 +10,7 @@
     <add key="ApiVersion" value="2" />
 
     <!-- API Actions & params -->
-    <add key="ConfigVersion" value="6.0.1.0" />
+    <add key="ConfigVersion" value="6.0.2.0" />
     <add key="SearchDefaultLimit" value="1000" />
     <add key="SearchFileCountLimit" value="1000" />
     <add key="SuppressFilenamesInStatus" value="0" />

diff --git a/Source/DfBAdminToolkit/ConfigBackup/DfBAdminToolkit.exe.config b/Source/DfBAdminToolkit/ConfigBackup/DfBAdminToolkit.exe.config
@@ -10,7 +10,7 @@
 		<add key="ApiVersion" value="2" />
 
 		<!-- API Actions & params -->
-    <add key="ConfigVersion" value="6.0.1.0" />
+    <add key="ConfigVersion" value="6.0.2.0" />
     <add key="SearchDefaultLimit" value="1000" />
     <add key="SearchFileCountLimit" value="1000" />
     <add key="SuppressFilenamesInStatus" value="0" />

diff --git a/Source/DfBAdminToolkit/Install Config/DfBAdminToolkit.exe.config b/Source/DfBAdminToolkit/Install Config/DfBAdminToolkit.exe.config
@@ -10,7 +10,7 @@
     <add key="ApiVersion" value="2" />
 
     <!-- API Actions & params -->
-	<add key="ConfigVersion" value="6.0.1.0" />
+	<add key="ConfigVersion" value="6.0.2.0" />
     <add key="SearchDefaultLimit" value="1000" />
     <add key="SearchFileCountLimit" value="1000" />
     <add key="SuppressFilenamesInStatus" value="0" />

diff --git a/Source/DfBAdminToolkit/Presenter/TeamHealthPresenter.cs b/Source/DfBAdminToolkit/Presenter/TeamHealthPresenter.cs
diff --git a/Source/DfBAdminToolkit/Properties/AssemblyInfo.cs b/Source/DfBAdminToolkit/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("6.0.1.0")]
-[assembly: AssemblyFileVersion("6.0.1.0")]
+[assembly: AssemblyVersion("6.0.2.0")]
+[assembly: AssemblyFileVersion("6.0.2.0")]
diff --git a/Source/DfBAdminToolkit/View/TeamAuditingView.cs b/Source/DfBAdminToolkit/View/TeamAuditingView.cs
@@ -112,6 +112,7 @@ public void Initialize()
 			DateTime resultTo = DateTime.Now;
 			dateTimePickerTo.Value = resultTo;
 			EndTime = resultTo;
+            TeamAuditingInputFilePath = textBoxTeamAuditing.Text;
 
             buttonEx_TeamAuditingExportToCSV.Enabled = false;
 		}

diff --git a/Source/DfBAdminToolkit/View/TeamAuditingView.designer.cs b/Source/DfBAdminToolkit/View/TeamAuditingView.designer.cs
diff --git a/Source/ProviderLauncher/Properties/AssemblyInfo.cs b/Source/ProviderLauncher/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("6.0.1.0")]
-[assembly: AssemblyFileVersion("6.0.1.0")]
+[assembly: AssemblyVersion("6.0.2.0")]
+[assembly: AssemblyFileVersion("6.0.2.0")]