Added support for Proxy.

Incremented version to 1.3
deepak-rathi · Oct 9, 2018 · 3e4aad2 · 3e4aad2
1 parent 359c243
commit 3e4aad2
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 7 deletions.
diff --git a/Setup/Product.wxs b/Setup/Product.wxs
@@ -21,7 +21,7 @@
 <!-- The manufacturer, for setup package publisher and folder info -->
 <?define Manufacturer = "Deepak Rathi" ?>
 <!-- The version number of this setup package-->
-<?define Version = "1.2.0" ?>
+<?define Version = "1.3.0" ?>
 <!-- UpgradeCode must be unique and not changed once the first version of the program is installed. -->
 <?define UpgradeCode = "a49a94d4-f09a-4e3b-9b7e-b058cddd504e" ?>
 <!-- The name of the Cabinet -->

diff --git a/VS2017OfflineSetupUtility/Properties/AssemblyInfo.cs b/VS2017OfflineSetupUtility/Properties/AssemblyInfo.cs
@@ -51,5 +51,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("1.2.0.0")]
-[assembly: AssemblyFileVersion("1.2.0.0")]
+[assembly: AssemblyVersion("1.3.0.0")]
+[assembly: AssemblyFileVersion("1.3.0.0")]
diff --git a/VS2017OfflineSetupUtility/Utils/FeatureUtil.cs b/VS2017OfflineSetupUtility/Utils/FeatureUtil.cs
@@ -30,15 +30,15 @@ internal static List<Feature> GetFeatures()
             var cleanUtilIcon = new CleanUtilIcon() { IsCheckedColor = (SolidColorBrush)App.Current.Resources["BlueSolidColorBrush"]};
             cleanUtilIcon.SetBinding(CleanUtilIcon.IsCheckedProperty, new System.Windows.Data.Binding("IsSelected") { UpdateSourceTrigger = System.Windows.Data.UpdateSourceTrigger.PropertyChanged});
 
-            var cleanUtilFeature = new Feature() { Icon =  cleanUtilIcon, Name = "VS2017 Offline Clean Util", About= "Allow deletion of old version Visual Studio 2017 Offline Setup files and folder, which saves your hard disk space.", Version="1.1.0.0", NavigateToView = new Views.CleanUtilPage() , IsSelected = true};
+            var cleanUtilFeature = new Feature() { Icon =  cleanUtilIcon, Name = "VS2017 Offline Clean Util", About= "Allow deletion of old version Visual Studio 2017 Offline Setup files and folder, which saves your hard disk space.", Version="1.3.0.0", NavigateToView = new Views.CleanUtilPage() , IsSelected = true};
 
             #endregion
 
             #region Download Util Feature
             var downloadUtilIcon = new DownloadUtilIcon() { IsCheckedColor = (SolidColorBrush)App.Current.Resources["BlueSolidColorBrush"]};
             downloadUtilIcon.SetBinding(DownloadUtilIcon.IsCheckedProperty, new System.Windows.Data.Binding("IsSelected") { UpdateSourceTrigger = System.Windows.Data.UpdateSourceTrigger.PropertyChanged });
 
-            var downloadUtilFeature = new Feature() { Icon = downloadUtilIcon, Name = "VS2017 Offline Download", About = "Download Visual Studio 2017 Offline Setup files and folder, using command line interface. (Need internet connection)", Version = "1.1.0.0" , NavigateToView  = new Views.DownloadUtilPage()};
+            var downloadUtilFeature = new Feature() { Icon = downloadUtilIcon, Name = "VS2017 Offline Download", About = "Download Visual Studio 2017 Offline Setup files and folder, using command line interface. (Need internet connection)", Version = "1.3.0.0" , NavigateToView  = new Views.DownloadUtilPage()};
 
             #endregion
 

diff --git a/VS2017OfflineSetupUtility/ViewModels/DownloadUtilPageViewModel.cs b/VS2017OfflineSetupUtility/ViewModels/DownloadUtilPageViewModel.cs
@@ -227,7 +227,11 @@ private void DownloadWorkloadFromWeb(string vsEdition)
             string markdownText = null;
             try
             {
-                markdownText = new WebClient().DownloadString(selectedVsEdition.WorkloadGitHubUri);
+                WebClient webClient = new WebClient();
+                IWebProxy webProxy = WebRequest.DefaultWebProxy;
+                webProxy.Credentials = CredentialCache.DefaultCredentials;
+                webClient.Proxy = webProxy;
+                markdownText = webClient.DownloadString(selectedVsEdition.WorkloadGitHubUri);
 
             }
             catch (Exception exception)
@@ -266,8 +270,12 @@ public DelegateCommand DownloadCommand
                     var subdirInfo = dirInfo.CreateSubdirectory("Setup");
                     try
                     {
+                        WebClient webClient = new WebClient();
+                        IWebProxy webProxy = WebRequest.DefaultWebProxy;
+                        webProxy.Credentials = CredentialCache.DefaultCredentials;
+                        webClient.Proxy = webProxy;
                         //Download Setup exe from web
-                        new WebClient().DownloadFile(new Uri(selectedVsEdition.SetupUri), subdirInfo.FullName + @"\vs_" + selectedVsEdition.Name + ".exe");
+                        webClient.DownloadFile(new Uri(selectedVsEdition.SetupUri), subdirInfo.FullName + @"\vs_" + selectedVsEdition.Name + ".exe");
                         File.WriteAllText(subdirInfo.FullName + @"\CliCommand.bat", CliText);
                         Process.Start(new ProcessStartInfo()
                         {

diff --git a/VS2017OfflineSetupUtility/bin/Release/VS2017OfflineSetupUtility.exe b/VS2017OfflineSetupUtility/bin/Release/VS2017OfflineSetupUtility.exe
diff --git a/VS2017OfflineSetupUtility/bin/Release/VS2017OfflineSetupUtility.pdb b/VS2017OfflineSetupUtility/bin/Release/VS2017OfflineSetupUtility.pdb