small refactoring done

This commit is contained in:
2020-08-14 15:34:39 +02:00
parent 89ef1b380e
commit fe9bb0098a
12 changed files with 48 additions and 102 deletions

View File

@@ -23,7 +23,7 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="29ab5463-4b97-401d-ab54-0cf6c10d440f" name="Default Changelist" comment=""> <list default="true" id="29ab5463-4b97-401d-ab54-0cf6c10d440f" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/OneDriveArchiver/Program.cs" beforeDir="false" afterPath="$PROJECT_DIR$/OneDriveArchiver/Program.cs" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/.idea.OneDriveArchiver/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.OneDriveArchiver/.idea/workspace.xml" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -93,7 +93,7 @@
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1597346163496</updated> <updated>1597346163496</updated>
<workItem from="1597346170811" duration="170000" /> <workItem from="1597346170811" duration="170000" />
<workItem from="1597346474415" duration="7873000" /> <workItem from="1597346474415" duration="9063000" />
</task> </task>
<task id="LOCAL-00001" summary="Migrated solution to .net core 3.1."> <task id="LOCAL-00001" summary="Migrated solution to .net core 3.1.">
<created>1597346544727</created> <created>1597346544727</created>
@@ -158,86 +158,86 @@
<screen x="0" y="0" width="1664" height="1069" /> <screen x="0" y="0" width="1664" height="1069" />
</state> </state>
<state width="399" height="466" key="DebuggerActiveHint/0.0.1664.1069/2496.0.640.440@0.0.1664.1069" timestamp="1597406505502" /> <state width="399" height="466" key="DebuggerActiveHint/0.0.1664.1069/2496.0.640.440@0.0.1664.1069" timestamp="1597406505502" />
<state width="1621" height="283" key="GridCell.Tab.0.bottom" timestamp="1597406769648"> <state width="1621" height="283" key="GridCell.Tab.0.bottom" timestamp="1597409127965">
<screen x="0" y="0" width="1664" height="1069" /> <screen x="0" y="0" width="1664" height="1069" />
</state> </state>
<state width="1621" height="283" key="GridCell.Tab.0.bottom/0.0.1664.1069/2496.0.640.440@0.0.1664.1069" timestamp="1597406769648" /> <state width="1621" height="283" key="GridCell.Tab.0.bottom/0.0.1664.1069/2496.0.640.440@0.0.1664.1069" timestamp="1597409127965" />
<state width="1621" height="283" key="GridCell.Tab.0.center" timestamp="1597406769648"> <state width="1621" height="283" key="GridCell.Tab.0.center" timestamp="1597409127965">
<screen x="0" y="0" width="1664" height="1069" /> <screen x="0" y="0" width="1664" height="1069" />
</state> </state>
<state width="1621" height="283" key="GridCell.Tab.0.center/0.0.1664.1069/2496.0.640.440@0.0.1664.1069" timestamp="1597406769648" /> <state width="1621" height="283" key="GridCell.Tab.0.center/0.0.1664.1069/2496.0.640.440@0.0.1664.1069" timestamp="1597409127965" />
<state width="1621" height="283" key="GridCell.Tab.0.left" timestamp="1597406769648"> <state width="1621" height="283" key="GridCell.Tab.0.left" timestamp="1597409127965">
<screen x="0" y="0" width="1664" height="1069" /> <screen x="0" y="0" width="1664" height="1069" />
</state> </state>
<state width="1621" height="283" key="GridCell.Tab.0.left/0.0.1664.1069/2496.0.640.440@0.0.1664.1069" timestamp="1597406769648" /> <state width="1621" height="283" key="GridCell.Tab.0.left/0.0.1664.1069/2496.0.640.440@0.0.1664.1069" timestamp="1597409127965" />
<state width="1621" height="283" key="GridCell.Tab.0.right" timestamp="1597406769648"> <state width="1621" height="283" key="GridCell.Tab.0.right" timestamp="1597409127965">
<screen x="0" y="0" width="1664" height="1069" /> <screen x="0" y="0" width="1664" height="1069" />
</state> </state>
<state width="1621" height="283" key="GridCell.Tab.0.right/0.0.1664.1069/2496.0.640.440@0.0.1664.1069" timestamp="1597406769648" /> <state width="1621" height="283" key="GridCell.Tab.0.right/0.0.1664.1069/2496.0.640.440@0.0.1664.1069" timestamp="1597409127965" />
<state width="1621" height="283" key="GridCell.Tab.1.bottom" timestamp="1597406769937"> <state width="1621" height="283" key="GridCell.Tab.1.bottom" timestamp="1597409127966">
<screen x="0" y="0" width="1664" height="1069" /> <screen x="0" y="0" width="1664" height="1069" />
</state> </state>
<state width="1621" height="283" key="GridCell.Tab.1.bottom/0.0.1664.1069/2496.0.640.440@0.0.1664.1069" timestamp="1597406769937" /> <state width="1621" height="283" key="GridCell.Tab.1.bottom/0.0.1664.1069/2496.0.640.440@0.0.1664.1069" timestamp="1597409127966" />
<state width="1621" height="283" key="GridCell.Tab.1.center" timestamp="1597406769937"> <state width="1621" height="283" key="GridCell.Tab.1.center" timestamp="1597409127966">
<screen x="0" y="0" width="1664" height="1069" /> <screen x="0" y="0" width="1664" height="1069" />
</state> </state>
<state width="1621" height="283" key="GridCell.Tab.1.center/0.0.1664.1069/2496.0.640.440@0.0.1664.1069" timestamp="1597406769937" /> <state width="1621" height="283" key="GridCell.Tab.1.center/0.0.1664.1069/2496.0.640.440@0.0.1664.1069" timestamp="1597409127966" />
<state width="1621" height="283" key="GridCell.Tab.1.left" timestamp="1597406769937"> <state width="1621" height="283" key="GridCell.Tab.1.left" timestamp="1597409127965">
<screen x="0" y="0" width="1664" height="1069" /> <screen x="0" y="0" width="1664" height="1069" />
</state> </state>
<state width="1621" height="283" key="GridCell.Tab.1.left/0.0.1664.1069/2496.0.640.440@0.0.1664.1069" timestamp="1597406769937" /> <state width="1621" height="283" key="GridCell.Tab.1.left/0.0.1664.1069/2496.0.640.440@0.0.1664.1069" timestamp="1597409127965" />
<state width="1621" height="283" key="GridCell.Tab.1.right" timestamp="1597406769937"> <state width="1621" height="283" key="GridCell.Tab.1.right" timestamp="1597409127966">
<screen x="0" y="0" width="1664" height="1069" /> <screen x="0" y="0" width="1664" height="1069" />
</state> </state>
<state width="1621" height="283" key="GridCell.Tab.1.right/0.0.1664.1069/2496.0.640.440@0.0.1664.1069" timestamp="1597406769937" /> <state width="1621" height="283" key="GridCell.Tab.1.right/0.0.1664.1069/2496.0.640.440@0.0.1664.1069" timestamp="1597409127966" />
<state width="1621" height="283" key="GridCell.Tab.2.bottom" timestamp="1597406769426"> <state width="1621" height="283" key="GridCell.Tab.2.bottom" timestamp="1597409127966">
<screen x="0" y="0" width="1664" height="1069" /> <screen x="0" y="0" width="1664" height="1069" />
</state> </state>
<state width="1621" height="283" key="GridCell.Tab.2.bottom/0.0.1664.1069/2496.0.640.440@0.0.1664.1069" timestamp="1597406769426" /> <state width="1621" height="283" key="GridCell.Tab.2.bottom/0.0.1664.1069/2496.0.640.440@0.0.1664.1069" timestamp="1597409127966" />
<state width="1621" height="283" key="GridCell.Tab.2.center" timestamp="1597406769426"> <state width="1621" height="283" key="GridCell.Tab.2.center" timestamp="1597409127966">
<screen x="0" y="0" width="1664" height="1069" /> <screen x="0" y="0" width="1664" height="1069" />
</state> </state>
<state width="1621" height="283" key="GridCell.Tab.2.center/0.0.1664.1069/2496.0.640.440@0.0.1664.1069" timestamp="1597406769426" /> <state width="1621" height="283" key="GridCell.Tab.2.center/0.0.1664.1069/2496.0.640.440@0.0.1664.1069" timestamp="1597409127966" />
<state width="1621" height="283" key="GridCell.Tab.2.left" timestamp="1597406769426"> <state width="1621" height="283" key="GridCell.Tab.2.left" timestamp="1597409127966">
<screen x="0" y="0" width="1664" height="1069" /> <screen x="0" y="0" width="1664" height="1069" />
</state> </state>
<state width="1621" height="283" key="GridCell.Tab.2.left/0.0.1664.1069/2496.0.640.440@0.0.1664.1069" timestamp="1597406769426" /> <state width="1621" height="283" key="GridCell.Tab.2.left/0.0.1664.1069/2496.0.640.440@0.0.1664.1069" timestamp="1597409127966" />
<state width="1621" height="283" key="GridCell.Tab.2.right" timestamp="1597406769426"> <state width="1621" height="283" key="GridCell.Tab.2.right" timestamp="1597409127966">
<screen x="0" y="0" width="1664" height="1069" /> <screen x="0" y="0" width="1664" height="1069" />
</state> </state>
<state width="1621" height="283" key="GridCell.Tab.2.right/0.0.1664.1069/2496.0.640.440@0.0.1664.1069" timestamp="1597406769426" /> <state width="1621" height="283" key="GridCell.Tab.2.right/0.0.1664.1069/2496.0.640.440@0.0.1664.1069" timestamp="1597409127966" />
<state width="1621" height="283" key="GridCell.Tab.3.bottom" timestamp="1597406769427"> <state width="1621" height="283" key="GridCell.Tab.3.bottom" timestamp="1597409127966">
<screen x="0" y="0" width="1664" height="1069" /> <screen x="0" y="0" width="1664" height="1069" />
</state> </state>
<state width="1621" height="283" key="GridCell.Tab.3.bottom/0.0.1664.1069/2496.0.640.440@0.0.1664.1069" timestamp="1597406769427" /> <state width="1621" height="283" key="GridCell.Tab.3.bottom/0.0.1664.1069/2496.0.640.440@0.0.1664.1069" timestamp="1597409127966" />
<state width="1621" height="283" key="GridCell.Tab.3.center" timestamp="1597406769426"> <state width="1621" height="283" key="GridCell.Tab.3.center" timestamp="1597409127966">
<screen x="0" y="0" width="1664" height="1069" /> <screen x="0" y="0" width="1664" height="1069" />
</state> </state>
<state width="1621" height="283" key="GridCell.Tab.3.center/0.0.1664.1069/2496.0.640.440@0.0.1664.1069" timestamp="1597406769426" /> <state width="1621" height="283" key="GridCell.Tab.3.center/0.0.1664.1069/2496.0.640.440@0.0.1664.1069" timestamp="1597409127966" />
<state width="1621" height="283" key="GridCell.Tab.3.left" timestamp="1597406769426"> <state width="1621" height="283" key="GridCell.Tab.3.left" timestamp="1597409127966">
<screen x="0" y="0" width="1664" height="1069" /> <screen x="0" y="0" width="1664" height="1069" />
</state> </state>
<state width="1621" height="283" key="GridCell.Tab.3.left/0.0.1664.1069/2496.0.640.440@0.0.1664.1069" timestamp="1597406769426" /> <state width="1621" height="283" key="GridCell.Tab.3.left/0.0.1664.1069/2496.0.640.440@0.0.1664.1069" timestamp="1597409127966" />
<state width="1621" height="283" key="GridCell.Tab.3.right" timestamp="1597406769427"> <state width="1621" height="283" key="GridCell.Tab.3.right" timestamp="1597409127966">
<screen x="0" y="0" width="1664" height="1069" /> <screen x="0" y="0" width="1664" height="1069" />
</state> </state>
<state width="1621" height="283" key="GridCell.Tab.3.right/0.0.1664.1069/2496.0.640.440@0.0.1664.1069" timestamp="1597406769427" /> <state width="1621" height="283" key="GridCell.Tab.3.right/0.0.1664.1069/2496.0.640.440@0.0.1664.1069" timestamp="1597409127966" />
<state width="1621" height="283" key="GridCell.Tab.4.bottom" timestamp="1597406769427"> <state width="1621" height="283" key="GridCell.Tab.4.bottom" timestamp="1597409127966">
<screen x="0" y="0" width="1664" height="1069" /> <screen x="0" y="0" width="1664" height="1069" />
</state> </state>
<state width="1621" height="283" key="GridCell.Tab.4.bottom/0.0.1664.1069/2496.0.640.440@0.0.1664.1069" timestamp="1597406769427" /> <state width="1621" height="283" key="GridCell.Tab.4.bottom/0.0.1664.1069/2496.0.640.440@0.0.1664.1069" timestamp="1597409127966" />
<state width="1621" height="283" key="GridCell.Tab.4.center" timestamp="1597406769427"> <state width="1621" height="283" key="GridCell.Tab.4.center" timestamp="1597409127966">
<screen x="0" y="0" width="1664" height="1069" /> <screen x="0" y="0" width="1664" height="1069" />
</state> </state>
<state width="1621" height="283" key="GridCell.Tab.4.center/0.0.1664.1069/2496.0.640.440@0.0.1664.1069" timestamp="1597406769427" /> <state width="1621" height="283" key="GridCell.Tab.4.center/0.0.1664.1069/2496.0.640.440@0.0.1664.1069" timestamp="1597409127966" />
<state width="1621" height="283" key="GridCell.Tab.4.left" timestamp="1597406769427"> <state width="1621" height="283" key="GridCell.Tab.4.left" timestamp="1597409127966">
<screen x="0" y="0" width="1664" height="1069" /> <screen x="0" y="0" width="1664" height="1069" />
</state> </state>
<state width="1621" height="283" key="GridCell.Tab.4.left/0.0.1664.1069/2496.0.640.440@0.0.1664.1069" timestamp="1597406769427" /> <state width="1621" height="283" key="GridCell.Tab.4.left/0.0.1664.1069/2496.0.640.440@0.0.1664.1069" timestamp="1597409127966" />
<state width="1621" height="283" key="GridCell.Tab.4.right" timestamp="1597406769427"> <state width="1621" height="283" key="GridCell.Tab.4.right" timestamp="1597409127966">
<screen x="0" y="0" width="1664" height="1069" /> <screen x="0" y="0" width="1664" height="1069" />
</state> </state>
<state width="1621" height="283" key="GridCell.Tab.4.right/0.0.1664.1069/2496.0.640.440@0.0.1664.1069" timestamp="1597406769427" /> <state width="1621" height="283" key="GridCell.Tab.4.right/0.0.1664.1069/2496.0.640.440@0.0.1664.1069" timestamp="1597409127966" />
<state x="425" y="267" key="Rider.ProjectTemplateDialog.Size" timestamp="1597346163416"> <state x="425" y="267" key="Rider.ProjectTemplateDialog.Size" timestamp="1597346163416">
<screen x="0" y="0" width="1664" height="1069" /> <screen x="0" y="0" width="1664" height="1069" />
</state> </state>

View File

@@ -40,15 +40,7 @@ namespace OneDriveArchiver
Console.WriteLine($"{appName}: starting up..."); Console.WriteLine($"{appName}: starting up...");
// set target path // set target path
string targetPath; var targetPath = args.Length == 1 ? Path.GetFullPath(".") : args[1];
if (args.Length == 1)
{
targetPath = Path.GetFullPath(".");
}
else
{
targetPath = args[1];
}
var startUpTime = DateTime.Now; var startUpTime = DateTime.Now;

View File

@@ -45,20 +45,6 @@
], ],
"assetTargetFallback": true, "assetTargetFallback": true,
"warn": true, "warn": true,
"downloadDependencies": [
{
"name": "Microsoft.AspNetCore.App.Runtime.win-x64",
"version": "[3.1.7, 3.1.7]"
},
{
"name": "Microsoft.NETCore.App.Runtime.win-x64",
"version": "[3.1.7, 3.1.7]"
},
{
"name": "Microsoft.WindowsDesktop.App.Runtime.win-x64",
"version": "[3.1.7, 3.1.7]"
}
],
"frameworkReferences": { "frameworkReferences": {
"Microsoft.NETCore.App": { "Microsoft.NETCore.App": {
"privateAssets": "all" "privateAssets": "all"
@@ -66,11 +52,6 @@
}, },
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.401\\RuntimeIdentifierGraph.json" "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.401\\RuntimeIdentifierGraph.json"
} }
},
"runtimes": {
"win-x64": {
"#import": []
}
} }
} }
} }

View File

@@ -7,11 +7,8 @@
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot> <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\johan\.nuget\packages\</NuGetPackageFolders> <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\johan\.nuget\packages\</NuGetPackageFolders>
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle> <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.7.0</NuGetToolVersion> <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.5.0</NuGetToolVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<SourceRoot Include="$([MSBuild]::EnsureTrailingSlash($(NuGetPackageFolders)))" />
</ItemGroup>
<PropertyGroup> <PropertyGroup>
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects> <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
</PropertyGroup> </PropertyGroup>

View File

@@ -1,8 +1,7 @@
{ {
"version": 3, "version": 3,
"targets": { "targets": {
".NETCoreApp,Version=v3.1": {}, ".NETCoreApp,Version=v3.1": {}
".NETCoreApp,Version=v3.1/win-x64": {}
}, },
"libraries": {}, "libraries": {},
"projectFileDependencyGroups": { "projectFileDependencyGroups": {
@@ -52,20 +51,6 @@
], ],
"assetTargetFallback": true, "assetTargetFallback": true,
"warn": true, "warn": true,
"downloadDependencies": [
{
"name": "Microsoft.AspNetCore.App.Runtime.win-x64",
"version": "[3.1.7, 3.1.7]"
},
{
"name": "Microsoft.NETCore.App.Runtime.win-x64",
"version": "[3.1.7, 3.1.7]"
},
{
"name": "Microsoft.WindowsDesktop.App.Runtime.win-x64",
"version": "[3.1.7, 3.1.7]"
}
],
"frameworkReferences": { "frameworkReferences": {
"Microsoft.NETCore.App": { "Microsoft.NETCore.App": {
"privateAssets": "all" "privateAssets": "all"
@@ -73,11 +58,6 @@
}, },
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.401\\RuntimeIdentifierGraph.json" "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.401\\RuntimeIdentifierGraph.json"
} }
},
"runtimes": {
"win-x64": {
"#import": []
}
} }
} }
} }

View File

@@ -1,12 +1,8 @@
{ {
"version": 2, "version": 2,
"dgSpecHash": "138W0tXEcg4vyZzmm0ngE67FUYyJmz4Gq9oY0SNEdYsE3cYuyqqgro97cunKtYN1Py1b03vmwmOtY6dFsNkKkg==", "dgSpecHash": "Ndf2WK+JZuJJUSvyjFv/NuMjlE5m2nyqs51nC/CyW5fmiE8JzEz8wgkXv1pT4YggV34Kw16kDBMDQzOCSER4GA==",
"success": true, "success": true,
"projectFilePath": "C:\\Users\\johan\\OneDrive\\DEV\\OneDriveArchiver\\OneDriveArchiver\\OneDriveArchiver.csproj", "projectFilePath": "C:\\Users\\johan\\OneDrive\\DEV\\OneDriveArchiver\\OneDriveArchiver\\OneDriveArchiver.csproj",
"expectedPackageFiles": [ "expectedPackageFiles": [],
"C:\\Users\\johan\\.nuget\\packages\\microsoft.netcore.app.runtime.win-x64\\3.1.7\\microsoft.netcore.app.runtime.win-x64.3.1.7.nupkg.sha512",
"C:\\Users\\johan\\.nuget\\packages\\microsoft.windowsdesktop.app.runtime.win-x64\\3.1.7\\microsoft.windowsdesktop.app.runtime.win-x64.3.1.7.nupkg.sha512",
"C:\\Users\\johan\\.nuget\\packages\\microsoft.aspnetcore.app.runtime.win-x64\\3.1.7\\microsoft.aspnetcore.app.runtime.win-x64.3.1.7.nupkg.sha512"
],
"logs": [] "logs": []
} }

View File

@@ -1 +1 @@
15974091276651972 15974120607874257