From a8531f45dc7177474c6654573f6ef700d1355a5d Mon Sep 17 00:00:00 2001 From: Arjun Sreedharan Date: Tue, 19 Nov 2024 18:01:10 +0000 Subject: [PATCH] Fix tests for .NET upgrade --- fixtures/console_app/console_app.csproj | 2 +- .../obj/console_app.csproj.nuget.dgspec.json | 30 +++++++++------ .../obj/console_app.csproj.nuget.g.props | 2 +- fixtures/console_app/obj/project.assets.json | 30 +++++++++------ fixtures/console_app/obj/project.nuget.cache | 4 +- fixtures/fsharp/fsharp.fsproj | 2 +- .../angular_dotnet/source-app.csproj | 4 +- .../src/asp_web_app/asp_web_app.csproj | 2 +- .../src/console_app/console_app.csproj | 2 +- .../obj/project.assets.json | 38 +++++++++++-------- .../obj/project.nuget.cache | 4 +- ...on => source_8.0.csproj.nuget.dgspec.json} | 36 ++++++++++-------- ....props => source_8.0.csproj.nuget.g.props} | 8 ++-- ...gets => source_8.0.csproj.nuget.g.targets} | 0 .../{source_6.0.csproj => source_8.0.csproj} | 3 +- fixtures/source_apps/source_9.0/buildpack.yml | 2 +- .../with_dot_in_name/with_dot_in_name.csproj | 2 +- .../dotnet_app/msbuild_self_contained.csproj | 2 +- 18 files changed, 99 insertions(+), 74 deletions(-) rename fixtures/source_apps/simple_legacy_openssl/obj/{source_6.0.csproj.nuget.dgspec.json => source_8.0.csproj.nuget.dgspec.json} (50%) rename fixtures/source_apps/simple_legacy_openssl/obj/{source_6.0.csproj.nuget.g.props => source_8.0.csproj.nuget.g.props} (82%) rename fixtures/source_apps/simple_legacy_openssl/obj/{source_6.0.csproj.nuget.g.targets => source_8.0.csproj.nuget.g.targets} (100%) rename fixtures/source_apps/simple_legacy_openssl/{source_6.0.csproj => source_8.0.csproj} (65%) diff --git a/fixtures/console_app/console_app.csproj b/fixtures/console_app/console_app.csproj index 40c60dd4c..6f4623a81 100644 --- a/fixtures/console_app/console_app.csproj +++ b/fixtures/console_app/console_app.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable enable diff --git a/fixtures/console_app/obj/console_app.csproj.nuget.dgspec.json b/fixtures/console_app/obj/console_app.csproj.nuget.dgspec.json index 7fe8ddeff..c13879d70 100644 --- a/fixtures/console_app/obj/console_app.csproj.nuget.dgspec.json +++ b/fixtures/console_app/obj/console_app.csproj.nuget.dgspec.json @@ -1,30 +1,30 @@ { "format": 1, "restore": { - "/test/test/console_app/console_app.csproj": {} + "/simple/console_app.csproj": {} }, "projects": { - "/test/test/console_app/console_app.csproj": { + "/simple/console_app.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "/test/test/console_app/console_app.csproj", + "projectUniqueName": "/simple/console_app.csproj", "projectName": "console_app", - "projectPath": "/test/test/console_app/console_app.csproj", + "projectPath": "/simple/console_app.csproj", "packagesPath": "/root/.nuget/packages/", - "outputPath": "/test/test/console_app/obj/", + "outputPath": "/simple/obj/", "projectStyle": "PackageReference", "configFilePaths": [ "/root/.nuget/NuGet/NuGet.Config" ], "originalTargetFrameworks": [ - "net6.0" + "net8.0" ], "sources": { "https://api.nuget.org/v3/index.json": {} }, "frameworks": { - "net6.0": { - "targetAlias": "net6.0", + "net8.0": { + "targetAlias": "net8.0", "projectReferences": {} } }, @@ -32,18 +32,24 @@ "warnAsError": [ "NU1605" ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" } }, "frameworks": { - "net6.0": { - "targetAlias": "net6.0", + "net8.0": { + "targetAlias": "net8.0", "imports": [ "net461", "net462", "net47", "net471", "net472", - "net48" + "net48", + "net481" ], "assetTargetFallback": true, "warn": true, @@ -52,7 +58,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "/usr/share/dotnet/sdk/6.0.300/RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "/usr/share/dotnet/sdk/8.0.404/PortableRuntimeIdentifierGraph.json" } } } diff --git a/fixtures/console_app/obj/console_app.csproj.nuget.g.props b/fixtures/console_app/obj/console_app.csproj.nuget.g.props index b16d8f9e3..112d2bbea 100644 --- a/fixtures/console_app/obj/console_app.csproj.nuget.g.props +++ b/fixtures/console_app/obj/console_app.csproj.nuget.g.props @@ -7,7 +7,7 @@ /root/.nuget/packages/ /root/.nuget/packages/ PackageReference - 6.2.0 + 6.11.1 diff --git a/fixtures/console_app/obj/project.assets.json b/fixtures/console_app/obj/project.assets.json index 4f5ecf872..da94918c8 100644 --- a/fixtures/console_app/obj/project.assets.json +++ b/fixtures/console_app/obj/project.assets.json @@ -1,11 +1,11 @@ { "version": 3, "targets": { - "net6.0": {} + "net8.0": {} }, "libraries": {}, "projectFileDependencyGroups": { - "net6.0": [] + "net8.0": [] }, "packageFolders": { "/root/.nuget/packages/": {} @@ -13,24 +13,24 @@ "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "/test/test/console_app/console_app.csproj", + "projectUniqueName": "/simple/console_app.csproj", "projectName": "console_app", - "projectPath": "/test/test/console_app/console_app.csproj", + "projectPath": "/simple/console_app.csproj", "packagesPath": "/root/.nuget/packages/", - "outputPath": "/test/test/console_app/obj/", + "outputPath": "/simple/obj/", "projectStyle": "PackageReference", "configFilePaths": [ "/root/.nuget/NuGet/NuGet.Config" ], "originalTargetFrameworks": [ - "net6.0" + "net8.0" ], "sources": { "https://api.nuget.org/v3/index.json": {} }, "frameworks": { - "net6.0": { - "targetAlias": "net6.0", + "net8.0": { + "targetAlias": "net8.0", "projectReferences": {} } }, @@ -38,18 +38,24 @@ "warnAsError": [ "NU1605" ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" } }, "frameworks": { - "net6.0": { - "targetAlias": "net6.0", + "net8.0": { + "targetAlias": "net8.0", "imports": [ "net461", "net462", "net47", "net471", "net472", - "net48" + "net48", + "net481" ], "assetTargetFallback": true, "warn": true, @@ -58,7 +64,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "/usr/share/dotnet/sdk/6.0.300/RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "/usr/share/dotnet/sdk/8.0.404/PortableRuntimeIdentifierGraph.json" } } } diff --git a/fixtures/console_app/obj/project.nuget.cache b/fixtures/console_app/obj/project.nuget.cache index 14dd6c751..890321227 100644 --- a/fixtures/console_app/obj/project.nuget.cache +++ b/fixtures/console_app/obj/project.nuget.cache @@ -1,8 +1,8 @@ { "version": 2, - "dgSpecHash": "C2ow/hc9AYgTvi8zon4y9R5HR1awmAeFuvovvAqFuR7OXh5H98KeFyjB8/f8iNDAH33tclHimz7HxiEAu0H29w==", + "dgSpecHash": "RzQoAPABuUE=", "success": true, - "projectFilePath": "/test/test/console_app/console_app.csproj", + "projectFilePath": "/simple/console_app.csproj", "expectedPackageFiles": [], "logs": [] } \ No newline at end of file diff --git a/fixtures/fsharp/fsharp.fsproj b/fixtures/fsharp/fsharp.fsproj index c9b2aaa42..8cff4a808 100644 --- a/fixtures/fsharp/fsharp.fsproj +++ b/fixtures/fsharp/fsharp.fsproj @@ -1,7 +1,7 @@ - netcoreapp6.0 + netcoreapp8.0 diff --git a/fixtures/node_apps/angular_dotnet/source-app.csproj b/fixtures/node_apps/angular_dotnet/source-app.csproj index 5f057f7d8..3e96794c0 100644 --- a/fixtures/node_apps/angular_dotnet/source-app.csproj +++ b/fixtures/node_apps/angular_dotnet/source-app.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 enable false ClientApp\ @@ -12,7 +12,7 @@ - + diff --git a/fixtures/source_apps/multiple_projects_msbuild/src/asp_web_app/asp_web_app.csproj b/fixtures/source_apps/multiple_projects_msbuild/src/asp_web_app/asp_web_app.csproj index 6db315e81..0bd9769b2 100755 --- a/fixtures/source_apps/multiple_projects_msbuild/src/asp_web_app/asp_web_app.csproj +++ b/fixtures/source_apps/multiple_projects_msbuild/src/asp_web_app/asp_web_app.csproj @@ -1,6 +1,6 @@  - netcoreapp6.0 + netcoreapp8.0 portable asp_web_app Exe diff --git a/fixtures/source_apps/multiple_projects_msbuild/src/console_app/console_app.csproj b/fixtures/source_apps/multiple_projects_msbuild/src/console_app/console_app.csproj index 0feb3460f..5375e7640 100755 --- a/fixtures/source_apps/multiple_projects_msbuild/src/console_app/console_app.csproj +++ b/fixtures/source_apps/multiple_projects_msbuild/src/console_app/console_app.csproj @@ -1,6 +1,6 @@  - netcoreapp6.0 + netcoreapp8.0 console_app diff --git a/fixtures/source_apps/simple_legacy_openssl/obj/project.assets.json b/fixtures/source_apps/simple_legacy_openssl/obj/project.assets.json index 4a07fe88f..c5f1f506c 100644 --- a/fixtures/source_apps/simple_legacy_openssl/obj/project.assets.json +++ b/fixtures/source_apps/simple_legacy_openssl/obj/project.assets.json @@ -1,36 +1,36 @@ { "version": 3, "targets": { - "net6.0": {} + "net8.0": {} }, "libraries": {}, "projectFileDependencyGroups": { - "net6.0": [] + "net8.0": [] }, "packageFolders": { - "/Users/meyera/.nuget/packages/": {} + "/root/.nuget/packages/": {} }, "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "/Users/meyera/workspace/dotnet-core-buildpack/fixtures/source_apps/source_6.0/source_6.0.csproj", - "projectName": "source_6.0", - "projectPath": "/Users/meyera/workspace/dotnet-core-buildpack/fixtures/source_apps/source_6.0/source_6.0.csproj", - "packagesPath": "/Users/meyera/.nuget/packages/", - "outputPath": "/Users/meyera/workspace/dotnet-core-buildpack/fixtures/source_apps/source_6.0/obj/", + "projectUniqueName": "/simple/source_8.0.csproj", + "projectName": "source_8.0", + "projectPath": "/simple/source_8.0.csproj", + "packagesPath": "/root/.nuget/packages/", + "outputPath": "/simple/obj/", "projectStyle": "PackageReference", "configFilePaths": [ - "/Users/meyera/.nuget/NuGet/NuGet.Config" + "/root/.nuget/NuGet/NuGet.Config" ], "originalTargetFrameworks": [ - "net6.0" + "net8.0" ], "sources": { "https://api.nuget.org/v3/index.json": {} }, "frameworks": { - "net6.0": { - "targetAlias": "net6.0", + "net8.0": { + "targetAlias": "net8.0", "projectReferences": {} } }, @@ -38,18 +38,24 @@ "warnAsError": [ "NU1605" ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" } }, "frameworks": { - "net6.0": { - "targetAlias": "net6.0", + "net8.0": { + "targetAlias": "net8.0", "imports": [ "net461", "net462", "net47", "net471", "net472", - "net48" + "net48", + "net481" ], "assetTargetFallback": true, "warn": true, @@ -61,7 +67,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/6.0.101/RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "/usr/share/dotnet/sdk/8.0.404/PortableRuntimeIdentifierGraph.json" } } } diff --git a/fixtures/source_apps/simple_legacy_openssl/obj/project.nuget.cache b/fixtures/source_apps/simple_legacy_openssl/obj/project.nuget.cache index 8f77c0a8e..6b9defae3 100644 --- a/fixtures/source_apps/simple_legacy_openssl/obj/project.nuget.cache +++ b/fixtures/source_apps/simple_legacy_openssl/obj/project.nuget.cache @@ -1,8 +1,8 @@ { "version": 2, - "dgSpecHash": "AJn9YIdR423CAUiEHQ0GiDtC/VV9wjJwO+5G5KNp060BKPM/352rK+gi6uLM8aT0dIp3slRmXMIfi4KIIIhTIA==", + "dgSpecHash": "39a3Oet003Y=", "success": true, - "projectFilePath": "/Users/meyera/workspace/dotnet-core-buildpack/fixtures/source_apps/source_6.0/source_6.0.csproj", + "projectFilePath": "/simple/source_8.0.csproj", "expectedPackageFiles": [], "logs": [] } \ No newline at end of file diff --git a/fixtures/source_apps/simple_legacy_openssl/obj/source_6.0.csproj.nuget.dgspec.json b/fixtures/source_apps/simple_legacy_openssl/obj/source_8.0.csproj.nuget.dgspec.json similarity index 50% rename from fixtures/source_apps/simple_legacy_openssl/obj/source_6.0.csproj.nuget.dgspec.json rename to fixtures/source_apps/simple_legacy_openssl/obj/source_8.0.csproj.nuget.dgspec.json index 68948d3df..a1c5ce9b5 100644 --- a/fixtures/source_apps/simple_legacy_openssl/obj/source_6.0.csproj.nuget.dgspec.json +++ b/fixtures/source_apps/simple_legacy_openssl/obj/source_8.0.csproj.nuget.dgspec.json @@ -1,30 +1,30 @@ { "format": 1, "restore": { - "/Users/meyera/workspace/dotnet-core-buildpack/fixtures/source_apps/source_6.0/source_6.0.csproj": {} + "/simple/source_8.0.csproj": {} }, "projects": { - "/Users/meyera/workspace/dotnet-core-buildpack/fixtures/source_apps/source_6.0/source_6.0.csproj": { + "/simple/source_8.0.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "/Users/meyera/workspace/dotnet-core-buildpack/fixtures/source_apps/source_6.0/source_6.0.csproj", - "projectName": "source_6.0", - "projectPath": "/Users/meyera/workspace/dotnet-core-buildpack/fixtures/source_apps/source_6.0/source_6.0.csproj", - "packagesPath": "/Users/meyera/.nuget/packages/", - "outputPath": "/Users/meyera/workspace/dotnet-core-buildpack/fixtures/source_apps/source_6.0/obj/", + "projectUniqueName": "/simple/source_8.0.csproj", + "projectName": "source_8.0", + "projectPath": "/simple/source_8.0.csproj", + "packagesPath": "/root/.nuget/packages/", + "outputPath": "/simple/obj/", "projectStyle": "PackageReference", "configFilePaths": [ - "/Users/meyera/.nuget/NuGet/NuGet.Config" + "/root/.nuget/NuGet/NuGet.Config" ], "originalTargetFrameworks": [ - "net6.0" + "net8.0" ], "sources": { "https://api.nuget.org/v3/index.json": {} }, "frameworks": { - "net6.0": { - "targetAlias": "net6.0", + "net8.0": { + "targetAlias": "net8.0", "projectReferences": {} } }, @@ -32,18 +32,24 @@ "warnAsError": [ "NU1605" ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" } }, "frameworks": { - "net6.0": { - "targetAlias": "net6.0", + "net8.0": { + "targetAlias": "net8.0", "imports": [ "net461", "net462", "net47", "net471", "net472", - "net48" + "net48", + "net481" ], "assetTargetFallback": true, "warn": true, @@ -55,7 +61,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/6.0.101/RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "/usr/share/dotnet/sdk/8.0.404/PortableRuntimeIdentifierGraph.json" } } } diff --git a/fixtures/source_apps/simple_legacy_openssl/obj/source_6.0.csproj.nuget.g.props b/fixtures/source_apps/simple_legacy_openssl/obj/source_8.0.csproj.nuget.g.props similarity index 82% rename from fixtures/source_apps/simple_legacy_openssl/obj/source_6.0.csproj.nuget.g.props rename to fixtures/source_apps/simple_legacy_openssl/obj/source_8.0.csproj.nuget.g.props index a443e1f98..112d2bbea 100644 --- a/fixtures/source_apps/simple_legacy_openssl/obj/source_6.0.csproj.nuget.g.props +++ b/fixtures/source_apps/simple_legacy_openssl/obj/source_8.0.csproj.nuget.g.props @@ -4,12 +4,12 @@ True NuGet $(MSBuildThisFileDirectory)project.assets.json - /Users/meyera/.nuget/packages/ - /Users/meyera/.nuget/packages/ + /root/.nuget/packages/ + /root/.nuget/packages/ PackageReference - 6.0.0 + 6.11.1 - + \ No newline at end of file diff --git a/fixtures/source_apps/simple_legacy_openssl/obj/source_6.0.csproj.nuget.g.targets b/fixtures/source_apps/simple_legacy_openssl/obj/source_8.0.csproj.nuget.g.targets similarity index 100% rename from fixtures/source_apps/simple_legacy_openssl/obj/source_6.0.csproj.nuget.g.targets rename to fixtures/source_apps/simple_legacy_openssl/obj/source_8.0.csproj.nuget.g.targets diff --git a/fixtures/source_apps/simple_legacy_openssl/source_6.0.csproj b/fixtures/source_apps/simple_legacy_openssl/source_8.0.csproj similarity index 65% rename from fixtures/source_apps/simple_legacy_openssl/source_6.0.csproj rename to fixtures/source_apps/simple_legacy_openssl/source_8.0.csproj index 618ae7162..278047775 100644 --- a/fixtures/source_apps/simple_legacy_openssl/source_6.0.csproj +++ b/fixtures/source_apps/simple_legacy_openssl/source_8.0.csproj @@ -1,9 +1,10 @@ - net6.0 + net8.0 enable enable + source_6._0 diff --git a/fixtures/source_apps/source_9.0/buildpack.yml b/fixtures/source_apps/source_9.0/buildpack.yml index 7367efc4b..b7350b790 100644 --- a/fixtures/source_apps/source_9.0/buildpack.yml +++ b/fixtures/source_apps/source_9.0/buildpack.yml @@ -1,2 +1,2 @@ dotnet-core: - sdk: 6.0.x + sdk: 9.0.x diff --git a/fixtures/source_apps/with_dot_in_name/with_dot_in_name.csproj b/fixtures/source_apps/with_dot_in_name/with_dot_in_name.csproj index c5651ebf7..e5d58dbf1 100644 --- a/fixtures/source_apps/with_dot_in_name/with_dot_in_name.csproj +++ b/fixtures/source_apps/with_dot_in_name/with_dot_in_name.csproj @@ -1,7 +1,7 @@ - netcoreapp6.0 + netcoreapp8.0 some_other.name diff --git a/fixtures/supply/dotnet_app/msbuild_self_contained.csproj b/fixtures/supply/dotnet_app/msbuild_self_contained.csproj index 32407faab..d970b04f0 100755 --- a/fixtures/supply/dotnet_app/msbuild_self_contained.csproj +++ b/fixtures/supply/dotnet_app/msbuild_self_contained.csproj @@ -1,7 +1,7 @@ - netcoreapp6.0 + netcoreapp8.0 msbuild_self_contained Exe msbuild_self_contained