Added ability to explicitly specify source and destination directories. So the files will land in the correct archive location despite being found in different folders.

This commit is contained in:
2020-08-14 14:42:50 +02:00
parent d7782fca79
commit 0390928b67
9 changed files with 50 additions and 4 deletions

View File

@@ -45,6 +45,20 @@
], ],
"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"
@@ -52,6 +66,11 @@
}, },
"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,8 +7,11 @@
<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.5.0</NuGetToolVersion> <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.7.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,7 +1,8 @@
{ {
"version": 3, "version": 3,
"targets": { "targets": {
".NETCoreApp,Version=v3.1": {} ".NETCoreApp,Version=v3.1": {},
".NETCoreApp,Version=v3.1/win-x64": {}
}, },
"libraries": {}, "libraries": {},
"projectFileDependencyGroups": { "projectFileDependencyGroups": {
@@ -51,6 +52,20 @@
], ],
"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"
@@ -58,6 +73,11 @@
}, },
"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,8 +1,12 @@
{ {
"version": 2, "version": 2,
"dgSpecHash": "Ndf2WK+JZuJJUSvyjFv/NuMjlE5m2nyqs51nC/CyW5fmiE8JzEz8wgkXv1pT4YggV34Kw16kDBMDQzOCSER4GA==", "dgSpecHash": "138W0tXEcg4vyZzmm0ngE67FUYyJmz4Gq9oY0SNEdYsE3cYuyqqgro97cunKtYN1Py1b03vmwmOtY6dFsNkKkg==",
"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": []
} }