Merge pull request #61 from NeilMacMullen/net7

Net7
NeilMacMullen · Mar 25, 2023 · fc91a41 · fc91a41
2 parents bc37701 + 4ca9f74
commit fc91a41
Show file tree

Hide file tree

Showing 12 changed files with 27 additions and 33 deletions.
diff --git a/Core/Core.csproj b/Core/Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/DriveProvider/DriveProvider.csproj b/DriveProvider/DriveProvider.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="System.Management.Automation" Version="7.2.7" />
+    <PackageReference Include="System.Management.Automation" Version="7.3.3" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Core\Core.csproj" />

diff --git a/DriveProvider/Properties/PublishProfiles/windows.pubxml b/DriveProvider/Properties/PublishProfiles/windows.pubxml
@@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <Platform>Any CPU</Platform>
     <PublishDir>..\publish\driveProviders</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <SelfContained>false</SelfContained>
     <PublishReadyToRun>True</PublishReadyToRun>

diff --git a/README.md b/README.md
@@ -12,23 +12,10 @@ If you like, or are using this project please give it a star - thanks!
 
 
 ## What's new?
-### vNext (source only)
-- migrate to Net6
+### v1.4.0 (Mar 2023)
+- migrate to Net7
 - slightly less intrusive version checking
 
-### v1.3.0
-- fixes an issue where `get-content jfs:x` would never terminate
-- fixed nuspec file
-- changed 'run' alias to 'jrun' to make alias collisions less likely
-
-### v1.2.0
-- Implemented 'remove' functionality
-- powershell and bash modules now better organised
-- better handling for missing bookmarks
-- If you pass an actual path instead of a bookmark, jumpfs now does the "right thing" in most cases.
-- Bookmarks can be exposed via [virtual drive](doc/psdrive.md) (Powershell 7 only)
-- It is now possible to bookmark Urls and shell commands
-
 See [full revision history](doc/revisionHistory.md)
 <hr/>
 

diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git a/build.ps1 b/build.ps1
@@ -1,13 +1,13 @@
 mkdir publish -Force
 Remove-Item publish\* -Recurse -Force
-dotnet publish -p:PublishProfile=linux
-dotnet publish -p:PublishProfile=windows
-
+dotnet publish .\jumpfs\jumpfs.csproj -p:PublishProfile=linux
+dotnet publish .\jumpfs\jumpfs.csproj -p:PublishProfile=windows
+dotnet publish .\DriveProvider\DriveProvider.csproj -p:PublishProfile=windows
 Remove-Item publish\*.pdb -Recurse
 
 Copy-Item scripts\bash\*.sh publish
 Copy-Item scripts\powershell\*.ps* publish
 Copy-Item scripts\cmd\*.bat publish 
 
 
-Write-Host "Artefacts are in the ./publish folder"
+Write-Host "Artefacts are in the ./publish folder" -ForegroundColor Green
diff --git a/doc/powershell-installation.md b/doc/powershell-installation.md
@@ -1,6 +1,6 @@
 # Installing for PowerShell
 
-Ensure you have [.NET 5.0 for Windows](https://dotnet.microsoft.com/download/dotnet/5.0) installed.  You only need the *.NET Runtime* unless you are planning to [build from source](buildFromSource.md).
+Ensure you have [.NET 7.0 for Windows](https://dotnet.microsoft.com/download/dotnet/7.0) installed.  You only need the *.NET Runtime* unless you are planning to [build from source](buildFromSource.md).
 
 Next, [download](download.md) or [build](buildFromSource.md) *jumpfs* and copy the files to a folder such as `C:\tools\jumpfs`.    
 

diff --git a/doc/revisionHistory.md b/doc/revisionHistory.md
@@ -1,5 +1,9 @@
 # Change log
 
+### v1.4.0
+- Migrate to Net7
+- Make version checking less intrusive by only checking on 1 in 10 startups
+
 ### v1.3.0
 - fixes an issue where `get-content jfs:x` would never terminate
 - fixed nuspec file
@@ -15,4 +19,4 @@
 See [full revision history](doc/revisionHistory.md)
 
 # v1.1.0 
-- Initial public release 
+- Initial public release 
diff --git a/jumpfs.sln b/jumpfs.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30223.230
+# Visual Studio Version 17
+VisualStudioVersion = 17.6.33513.286
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "jumpfs", "jumpfs\jumpfs.csproj", "{E9E6F99B-8455-40F9-BD52-61987D8D8A36}"
 EndProject
@@ -41,16 +41,19 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "doc", "doc", "{C3EA9AA4-775
 		doc\cmd-installation.md = doc\cmd-installation.md
 		doc\contributions.md = doc\contributions.md
 		doc\download.md = doc\download.md
+		doc\faq.md = doc\faq.md
 		doc\jumpfs-exe.md = doc\jumpfs-exe.md
 		doc\linux-installation.md = doc\linux-installation.md
 		doc\powershell-installation.md = doc\powershell-installation.md
+		doc\psdrive.md = doc\psdrive.md
+		doc\revisionHistory.md = doc\revisionHistory.md
 		doc\troubleshooting.md = doc\troubleshooting.md
 		doc\wsl-installation.md = doc\wsl-installation.md
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DriveProvider", "DriveProvider\DriveProvider.csproj", "{0363DE4C-0569-4C5C-8A9F-0B3EF821D7E1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DriveProvider", "DriveProvider\DriveProvider.csproj", "{0363DE4C-0569-4C5C-8A9F-0B3EF821D7E1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core", "Core\Core.csproj", "{3E33E98C-240B-403A-A1D6-FA809B4DEB4F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core", "Core\Core.csproj", "{3E33E98C-240B-403A-A1D6-FA809B4DEB4F}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/jumpfs/Properties/PublishProfiles/linux.pubxml b/jumpfs/Properties/PublishProfiles/linux.pubxml
@@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <Platform>Any CPU</Platform>
     <PublishDir>..\publish</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
     <SelfContained>false</SelfContained>
     <PublishSingleFile>True</PublishSingleFile>

diff --git a/jumpfs/Properties/PublishProfiles/windows.pubxml b/jumpfs/Properties/PublishProfiles/windows.pubxml
@@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <Platform>Any CPU</Platform>
     <PublishDir>..\publish</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <SelfContained>false</SelfContained>
     <PublishSingleFile>True</PublishSingleFile>

diff --git a/jumpfs/jumpfs.csproj b/jumpfs/jumpfs.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>