diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 32bb9b76c1d6cc..1ef98ce750aef6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -62,9 +62,9 @@ https://github.com/dotnet/arcade 6baa6d3c20effeee3631eb33e9e08bcf698a799c - + https://github.com/dotnet/arcade - 6baa6d3c20effeee3631eb33e9e08bcf698a799c + 3d3bc7c7181b6f1b4a930ef0c88a388765379c77 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/global.json b/global.json index b26867121daf34..f8d084974e7b40 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ "msbuild-sdks": { "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.20431.4", "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20431.4", - "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20431.4", + "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20452.6", "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20431.4", "Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "5.0.0-preview.8.20359.4", diff --git a/src/installer/pkg/projects/Directory.Build.targets b/src/installer/pkg/projects/Directory.Build.targets index 3e307549eecc09..383e5549c36e98 100644 --- a/src/installer/pkg/projects/Directory.Build.targets +++ b/src/installer/pkg/projects/Directory.Build.targets @@ -145,6 +145,15 @@ + + + + + diff --git a/src/installer/pkg/projects/netcoreapp/pkg/legacy/Microsoft.NETCore.App.pkgproj b/src/installer/pkg/projects/netcoreapp/pkg/legacy/Microsoft.NETCore.App.pkgproj index 4ca074396a5380..5636c4b32e44cc 100644 --- a/src/installer/pkg/projects/netcoreapp/pkg/legacy/Microsoft.NETCore.App.pkgproj +++ b/src/installer/pkg/projects/netcoreapp/pkg/legacy/Microsoft.NETCore.App.pkgproj @@ -7,8 +7,28 @@ --> false + true + data/ true + + + + + + + + + + + + + + + + + +