Fixed VS2017 URL and changed target version to .Net 8.0

deepak-rathi · Nov 9, 2024 · d9e94a7 · d9e94a7
1 parent 6defc79
commit d9e94a7
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/Setup/Product.Core.wxs b/Setup/Product.Core.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.4.2" ?>
+<?define Version = "1.4.4" ?>
 <!-- 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 -->
@@ -131,7 +131,7 @@
                   Name="$(var.Name)"
                   Description="$(var.Description)"
                   Directory="DesktopFolder"
-                  Target="[#Sample_Application.exe]"
+                  Target="[#VS2017OfflineSetupUtil_Application.exe]"
                   WorkingDirectory="INSTALLFOLDER"/>
         <!--Remove desktop shortcut on uninstall-->
         <RemoveFolder Id="DesktopFolder" On="uninstall"/>

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/2019/2022 Offline Clean Util", About= "Allow deletion of old version Visual Studio 2017/2019/2022 Offline Setup files and folder, which saves your hard disk space.", Version="1.4.3.0", NavigateToView = new Views.CleanUtilPage() , IsSelected = true};
+            var cleanUtilFeature = new Feature() { Icon =  cleanUtilIcon, Name = "VS2017/2019/2022 Offline Clean Util", About= "Allow deletion of old version Visual Studio 2017/2019/2022 Offline Setup files and folder, which saves your hard disk space.", Version="1.4.4.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/2019/2022 Offline Download", About = "Download Visual Studio 2017/2019/2022 Offline Setup files and folder, using command line interface. (Need internet connection)", Version = "1.4.3.0" , NavigateToView  = new Views.DownloadUtilPage()};
+            var downloadUtilFeature = new Feature() { Icon = downloadUtilIcon, Name = "VS2017/2019/2022 Offline Download", About = "Download Visual Studio 2017/2019/2022 Offline Setup files and folder, using command line interface. (Need internet connection)", Version = "1.4.4.0" , NavigateToView  = new Views.DownloadUtilPage()};
 
             #endregion
 

diff --git a/VS2017OfflineSetupUtility/Utils/VsEditionUtil.cs b/VS2017OfflineSetupUtility/Utils/VsEditionUtil.cs
@@ -29,23 +29,23 @@ internal static List<VsEdition> GetAllVisualStudioEditions()
                     Name = "Visual Studio 2017 Community",
                     SetupUri = "https://aka.ms/vs/15/release/vs_community.exe",
                     WorkloadDocUri = "https://docs.microsoft.com/en-us/visualstudio/install/workload-component-id-vs-community?view=vs-2017",
-                    WorkloadGitHubUri = "https://raw.githubusercontent.com/MicrosoftDocs/visualstudio-docs/master/docs/install/includes/vs-2017/workload-component-id-vs-community.md",
+                    WorkloadGitHubUri = "https://raw.githubusercontent.com/MicrosoftDocs/visualstudio-docs/d31aa83d1e31658ca5d82c318a766a36e5746962/docs/install/includes/vs-2017/workload-component-id-vs-community.md",
                 },
 
                 new VsEdition() {
                     Version = "15P",
                     Name = "Visual Studio 2017 Professional",
                     SetupUri = "https://aka.ms/vs/15/release/vs_professional.exe",
                     WorkloadDocUri = "https://docs.microsoft.com/en-us/visualstudio/install/workload-component-id-vs-professional?view=vs-2017",
-                    WorkloadGitHubUri = "https://raw.githubusercontent.com/MicrosoftDocs/visualstudio-docs/master/docs/install/includes/vs-2017/workload-component-id-vs-professional.md",
+                    WorkloadGitHubUri = "https://raw.githubusercontent.com/MicrosoftDocs/visualstudio-docs/d31aa83d1e31658ca5d82c318a766a36e5746962/docs/install/includes/vs-2017/workload-component-id-vs-professional.md",
                 },
 
                 new VsEdition()  {
                     Version = "15E",
                     Name = "Visual Studio 2017 Enterprise",
                     SetupUri = "https://aka.ms/vs/15/release/vs_enterprise.exe",
                     WorkloadDocUri = "https://docs.microsoft.com/en-us/visualstudio/install/workload-component-id-vs-enterprise?view=vs-2017",
-                    WorkloadGitHubUri = "https://raw.githubusercontent.com/MicrosoftDocs/visualstudio-docs/master/docs/install/includes/vs-2017/workload-component-id-vs-enterprise.md",
+                    WorkloadGitHubUri = "https://raw.githubusercontent.com/MicrosoftDocs/visualstudio-docs/d31aa83d1e31658ca5d82c318a766a36e5746962/docs/install/includes/vs-2017/workload-component-id-vs-enterprise.md",
                 },
 
                 new VsEdition() {

diff --git a/VS2017OfflineSetupUtility/VS2017OfflineSetupUtility.Core.csproj b/VS2017OfflineSetupUtility/VS2017OfflineSetupUtility.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0-windows</TargetFramework>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <UseWPF>true</UseWPF>
     <UseWindowsForms>true</UseWindowsForms>
     <PublishSingleFile>true</PublishSingleFile>
@@ -11,7 +11,7 @@
     <IncludeAllContentForSelfExtract>true</IncludeAllContentForSelfExtract>
     <EnableCompressionInSingleFile>true</EnableCompressionInSingleFile>
     <StartupObject>VS2017OfflineSetupUtility.App</StartupObject>
-    <Version>1.4.2</Version>
+    <Version>1.4.4</Version>
     <Product>VS2017 Offline Setup Utility</Product>
     <PackageLicenseExpression>
     </PackageLicenseExpression>
@@ -21,12 +21,12 @@
     </PackageIcon>
     <RepositoryUrl>https://github.com/deepak-rathi/VS2017OfflineSetupUtility</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
-    <PackageReleaseNotes>Upgraded to .Net7</PackageReleaseNotes>
+    <PackageReleaseNotes>Upgraded to .Net8</PackageReleaseNotes>
     <PackageId>VS2017OfflineSetupUtility</PackageId>
     <ApplicationIcon>Assets\logo.ico</ApplicationIcon>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
-    <Copyright>Copyright ©  2017-2023 Deepak Rathi</Copyright>
+    <Copyright>Copyright ©  2017-2024 Deepak Rathi</Copyright>
     <Description>This utility allow downloading offline setup or deletion of old version Visual Studio 2017/2019/2022 Offline Setup files and folder.</Description>
     <AssemblyName>VS2017OfflineSetupUtility</AssemblyName>
   </PropertyGroup>
@@ -46,8 +46,8 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
-    <PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="8.0.10" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Assets\logo.ico">

diff --git a/VS2017OfflineSetupUtility/Views/CleanUtilPage.xaml b/VS2017OfflineSetupUtility/Views/CleanUtilPage.xaml
@@ -128,7 +128,7 @@
                 <TextBlock Text="About" Style="{StaticResource SubHeaderTextBlockStyle}" Padding="14,20,14,5"/>
                 <TextBlock Text="Allow deletion of old version Visual Studio 2017/2019/2022 Offline Setup files and folder, which saves your hard disk space." Style="{StaticResource BodyTextBlockStyle}" Padding="14,0"/>
                 <TextBlock Text="Version" Style="{StaticResource SubHeaderTextBlockStyle}" Padding="14,20,14,5"/>
-                <TextBlock Text="1.4.3.0" Style="{StaticResource BodyTextBlockStyle}" Padding="14,0"/>
+                <TextBlock Text="1.4.4.0" Style="{StaticResource BodyTextBlockStyle}" Padding="14,0"/>
             </StackPanel>
             <!--#endregion Right Content-->
         </Grid>

diff --git a/VS2017OfflineSetupUtility/Views/DownloadUtilPage.xaml b/VS2017OfflineSetupUtility/Views/DownloadUtilPage.xaml
@@ -176,7 +176,7 @@
                 <TextBlock Text="About" Style="{StaticResource SubHeaderTextBlockStyle}" Padding="14,20,14,5"/>
                 <TextBlock Text="Download Visual Studio 2017/2019/2022 Offline Setup files and folder, using command line interface. (Need internet connection)" Style="{StaticResource BodyTextBlockStyle}" Padding="14,0"/>
                 <TextBlock Text="Version" Style="{StaticResource SubHeaderTextBlockStyle}" Padding="14,20,14,5"/>
-                <TextBlock Text="1.4.3.0" Style="{StaticResource BodyTextBlockStyle}" Padding="14,0"/>
+                <TextBlock Text="1.4.4.0" Style="{StaticResource BodyTextBlockStyle}" Padding="14,0"/>
             </StackPanel>
             <!--#endregion Right Content-->
         </Grid>