diff --git a/Directory.Build.props b/Directory.Build.props index 0605f449c7b..9a2b4b2e3e2 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -46,6 +46,8 @@ https://docs.microsoft.com/ef/core/ $(MSBuildThisFileDirectory)logo\ef-logo.png false + + $(NetCurrent) diff --git a/activate.ps1 b/activate.ps1 index efd5b6da47b..7b95c1cd3c8 100644 --- a/activate.ps1 +++ b/activate.ps1 @@ -20,7 +20,6 @@ function deactivate ([switch]$init) { } Remove-Item env:DOTNET_ROOT -ErrorAction Ignore - Remove-Item env:DOTNET_MULTILEVEL_LOOKUP -ErrorAction Ignore if (-not $init) { # Remove the deactivate function Remove-Item function:deactivate @@ -33,8 +32,6 @@ deactivate -init $_OLD_PATH = $env:PATH # Tell dotnet where to find itself $env:DOTNET_ROOT = "$PSScriptRoot\.dotnet" -# Tell dotnet not to look beyond the DOTNET_ROOT folder for more dotnet things -$env:DOTNET_MULTILEVEL_LOOKUP = 0 # Put dotnet first on PATH $env:PATH = "${env:DOTNET_ROOT};${env:PATH}" diff --git a/activate.sh b/activate.sh index 42fbcf1a6d5..85ac25ab127 100755 --- a/activate.sh +++ b/activate.sh @@ -28,7 +28,6 @@ deactivate () { fi unset DOTNET_ROOT - unset DOTNET_MULTILEVEL_LOOKUP if [ ! "${1:-}" = "init" ] ; then # Remove the deactivate function unset -f deactivate @@ -42,8 +41,6 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" _OLD_PATH="$PATH" # Tell dotnet where to find itself export DOTNET_ROOT="$DIR/.dotnet" -# Tell dotnet not to look beyond the DOTNET_ROOT folder for more dotnet things -export DOTNET_MULTILEVEL_LOOKUP=0 # Put dotnet first on PATH export PATH="$DOTNET_ROOT:$PATH" diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 4c76918a11c..2b7e1d4d88d 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,24 +6,24 @@ This file should be imported by eng/Versions.props - 11.0.0-beta.25578.104 - 11.0.0-beta.25578.104 - 11.0.0-beta.25578.104 - 10.0.0-rc.3.25578.104 - 10.0.0-rc.3.25578.104 - 10.0.0-rc.3.25578.104 - 10.0.0-rc.3.25578.104 - 10.0.0-rc.3.25578.104 - 10.0.0-rc.3.25578.104 - 10.0.0-rc.3.25578.104 - 10.0.0-rc.3.25578.104 - 10.0.0-rc.3.25578.104 - 10.0.0-rc.3.25578.104 - 10.0.0-rc.3.25578.104 - 10.0.0-rc.3.25578.104 - 10.0.0-rc.3.25578.104 - 10.0.0-rc.3.25578.104 - 10.0.0-rc.3.25578.104 + 11.0.0-beta.26064.107 + 11.0.0-beta.26064.107 + 11.0.0-beta.26064.107 + 11.0.0-alpha.1.26064.107 + 11.0.0-alpha.1.26064.107 + 11.0.0-alpha.1.26064.107 + 11.0.0-alpha.1.26064.107 + 11.0.0-alpha.1.26064.107 + 11.0.0-alpha.1.26064.107 + 11.0.0-alpha.1.26064.107 + 11.0.0-alpha.1.26064.107 + 11.0.0-alpha.1.26064.107 + 11.0.0-alpha.1.26064.107 + 11.0.0-alpha.1.26064.107 + 11.0.0-alpha.1.26064.107 + 11.0.0-alpha.1.26064.107 + 11.0.0-alpha.1.26064.107 + 11.0.0-alpha.1.26064.107 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3700068c209..f14f4eb6ae0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,80 +1,80 @@ - + - + https://github.com/dotnet/dotnet - 3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1 + 887f3d5a26e1001ee2777afde10cadcacb8cc735 - + https://github.com/dotnet/dotnet - 3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1 + 887f3d5a26e1001ee2777afde10cadcacb8cc735 - + https://github.com/dotnet/dotnet - 3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1 + 887f3d5a26e1001ee2777afde10cadcacb8cc735 - + https://github.com/dotnet/dotnet - 3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1 + 887f3d5a26e1001ee2777afde10cadcacb8cc735 - + https://github.com/dotnet/dotnet - 3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1 + 887f3d5a26e1001ee2777afde10cadcacb8cc735 - + https://github.com/dotnet/dotnet - 3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1 + 887f3d5a26e1001ee2777afde10cadcacb8cc735 - + https://github.com/dotnet/dotnet - 3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1 + 887f3d5a26e1001ee2777afde10cadcacb8cc735 - + https://github.com/dotnet/dotnet - 3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1 + 887f3d5a26e1001ee2777afde10cadcacb8cc735 - + https://github.com/dotnet/dotnet - 3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1 + 887f3d5a26e1001ee2777afde10cadcacb8cc735 - + https://github.com/dotnet/dotnet - 3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1 + 887f3d5a26e1001ee2777afde10cadcacb8cc735 - + https://github.com/dotnet/dotnet - 3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1 + 887f3d5a26e1001ee2777afde10cadcacb8cc735 - + https://github.com/dotnet/dotnet - 3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1 + 887f3d5a26e1001ee2777afde10cadcacb8cc735 - + https://github.com/dotnet/dotnet - 3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1 + 887f3d5a26e1001ee2777afde10cadcacb8cc735 - + https://github.com/dotnet/dotnet - 3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1 + 887f3d5a26e1001ee2777afde10cadcacb8cc735 - + https://github.com/dotnet/dotnet - 3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1 + 887f3d5a26e1001ee2777afde10cadcacb8cc735 - + https://github.com/dotnet/dotnet - 3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1 + 887f3d5a26e1001ee2777afde10cadcacb8cc735 - + https://github.com/dotnet/dotnet - 3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1 + 887f3d5a26e1001ee2777afde10cadcacb8cc735 - + https://github.com/dotnet/dotnet - 3b5d49bb1053c228d431a7ea95a8bec6f9f16ab1 + 887f3d5a26e1001ee2777afde10cadcacb8cc735 diff --git a/eng/Versions.props b/eng/Versions.props index e68eb751318..e112e960125 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,20 +3,19 @@ - 10.0.3 - servicing - + 11.0.0 + alpha + 1 False - net10.0 false - - + + 18.0.2 18.0.2 18.0.2 @@ -24,6 +23,7 @@ 5.0.0 5.0.0 + 1.1.3-beta1.25564.1 @@ -33,8 +33,10 @@ 1.12.0 3.0.2 + 1.1.118 1.0.0-beta.59 + diff --git a/eng/common/core-templates/job/job.yml b/eng/common/core-templates/job/job.yml index cb4ccc023a3..748c4f07a64 100644 --- a/eng/common/core-templates/job/job.yml +++ b/eng/common/core-templates/job/job.yml @@ -73,6 +73,8 @@ jobs: templateContext: ${{ parameters.templateContext }} variables: + - name: AllowPtrToDetectTestRunRetryFiles + value: true - ${{ if ne(parameters.enableTelemetry, 'false') }}: - name: DOTNET_CLI_TELEMETRY_PROFILE value: '$(Build.Repository.Uri)' diff --git a/eng/common/core-templates/job/source-build.yml b/eng/common/core-templates/job/source-build.yml index 9f6b3ee9e46..9d820f97421 100644 --- a/eng/common/core-templates/job/source-build.yml +++ b/eng/common/core-templates/job/source-build.yml @@ -63,7 +63,7 @@ jobs: demands: ImageOverride -equals build.ubuntu.2204.amd64 ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] - image: 1es-mariner-2 + image: 1es-azurelinux-3 os: linux ${{ else }}: pool: diff --git a/eng/common/core-templates/steps/install-microbuild-impl.yml b/eng/common/core-templates/steps/install-microbuild-impl.yml index b9e0143ee92..da22beb3f60 100644 --- a/eng/common/core-templates/steps/install-microbuild-impl.yml +++ b/eng/common/core-templates/steps/install-microbuild-impl.yml @@ -18,7 +18,7 @@ parameters: type: boolean steps: -- ${{ if eq(parameters.enablePreviewMicrobuild, 'true') }}: +- ${{ if eq(parameters.enablePreviewMicrobuild, true) }}: - task: MicroBuildSigningPluginPreview@4 displayName: Install Preview MicroBuild plugin inputs: ${{ parameters.microbuildTaskInputs }} diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml index b9c86c18ae4..acf16ed3496 100644 --- a/eng/common/core-templates/steps/source-build.yml +++ b/eng/common/core-templates/steps/source-build.yml @@ -24,7 +24,7 @@ steps: # in the default public locations. internalRuntimeDownloadArgs= if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then - internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://ci.dot.net/internal --runtimesourcefeedkey '$(dotnetbuilds-internal-container-read-token-base64)'' + internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://ci.dot.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' fi buildConfig=Release diff --git a/eng/common/core-templates/steps/source-index-stage1-publish.yml b/eng/common/core-templates/steps/source-index-stage1-publish.yml index ac019e2d033..3ad83b8c307 100644 --- a/eng/common/core-templates/steps/source-index-stage1-publish.yml +++ b/eng/common/core-templates/steps/source-index-stage1-publish.yml @@ -14,8 +14,8 @@ steps: workingDirectory: $(Agent.TempDirectory) - script: | - $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version ${{parameters.sourceIndexProcessBinlogPackageVersion}} --source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools - $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version ${{parameters.sourceIndexUploadPackageVersion}} --source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools + $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version ${{parameters.sourceIndexProcessBinlogPackageVersion}} --source ${{parameters.sourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools + $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version ${{parameters.sourceIndexUploadPackageVersion}} --source ${{parameters.sourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools displayName: "Source Index: Download netsourceindex Tools" # Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk. workingDirectory: $(Agent.TempDirectory) diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 8abfb71f727..9b7eede4e50 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -72,7 +72,7 @@ __AlpinePackages+=" krb5-dev" __AlpinePackages+=" openssl-dev" __AlpinePackages+=" zlib-dev" -__FreeBSDBase="13.4-RELEASE" +__FreeBSDBase="13.5-RELEASE" __FreeBSDPkg="1.21.3" __FreeBSDABI="13" __FreeBSDPackages="libunwind" @@ -383,7 +383,7 @@ while :; do ;; freebsd14) __CodeName=freebsd - __FreeBSDBase="14.2-RELEASE" + __FreeBSDBase="14.3-RELEASE" __FreeBSDABI="14" __SkipUnmount=1 ;; diff --git a/eng/common/native/install-dependencies.sh b/eng/common/native/install-dependencies.sh index 64b87d0bcc3..11f81cbd40d 100755 --- a/eng/common/native/install-dependencies.sh +++ b/eng/common/native/install-dependencies.sh @@ -27,7 +27,7 @@ case "$os" in libssl-dev libkrb5-dev pigz cpio localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 - elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ] || [ "$ID" = "azurelinux" ] || [ "$ID" = "centos"]; then + elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ] || [ "$ID" = "azurelinux" ] || [ "$ID" = "centos" ]; then pkg_mgr="$(command -v tdnf 2>/dev/null || command -v dnf)" $pkg_mgr install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio elif [ "$ID" = "amzn" ]; then diff --git a/eng/common/templates-official/post-build/setup-maestro-vars.yml b/eng/common/templates-official/post-build/setup-maestro-vars.yml index 5b48810c1de..024397d8786 100644 --- a/eng/common/templates-official/post-build/setup-maestro-vars.yml +++ b/eng/common/templates-official/post-build/setup-maestro-vars.yml @@ -5,4 +5,4 @@ steps: is1ESPipeline: true ${{ each parameter in parameters }}: - ${{ parameter.key }}: ${{ parameter.value }} + ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 049fe6db994..f6bde268379 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -157,9 +157,6 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) { return $global:_DotNetInstallDir } - # Don't resolve runtime, shared framework, or SDK from other locations to ensure build determinism - $env:DOTNET_MULTILEVEL_LOOKUP=0 - # Disable first run since we do not need all ASP.NET packages restored. $env:DOTNET_NOLOGO=1 @@ -225,7 +222,6 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) { # Make Sure that our bootstrapped dotnet cli is available in future steps of the Azure Pipelines build Write-PipelinePrependPath -Path $dotnetRoot - Write-PipelineSetVariable -Name 'DOTNET_MULTILEVEL_LOOKUP' -Value '0' Write-PipelineSetVariable -Name 'DOTNET_NOLOGO' -Value '1' return $global:_DotNetInstallDir = $dotnetRoot diff --git a/eng/common/tools.sh b/eng/common/tools.sh index c1841c9dfd0..6c121300ac7 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -115,9 +115,6 @@ function InitializeDotNetCli { local install=$1 - # Don't resolve runtime, shared framework, or SDK from other locations to ensure build determinism - export DOTNET_MULTILEVEL_LOOKUP=0 - # Disable first run since we want to control all package sources export DOTNET_NOLOGO=1 @@ -166,7 +163,6 @@ function InitializeDotNetCli { # build steps from using anything other than what we've downloaded. Write-PipelinePrependPath -path "$dotnet_root" - Write-PipelineSetVariable -name "DOTNET_MULTILEVEL_LOOKUP" -value "0" Write-PipelineSetVariable -name "DOTNET_NOLOGO" -value "1" # return value diff --git a/eng/helix.proj b/eng/helix.proj index 93fdfbf1393..81c6772d101 100644 --- a/eng/helix.proj +++ b/eng/helix.proj @@ -73,7 +73,7 @@ - net10.0 + $(NetCurrent) netcoreapp2.0 02:00:00 diff --git a/global.json b/global.json index 842a6e33a1f..a26c5dee2ca 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "10.0.101", + "version": "11.0.100-alpha.1.26060.102", "allowPrerelease": true, "rollForward": "latestMajor", "paths": [ @@ -10,7 +10,7 @@ "errorMessage": "The required .NET SDK wasn't found. Please run ./restore.sh or .\\restore.cmd to install it." }, "tools": { - "dotnet": "10.0.101", + "dotnet": "11.0.100-alpha.1.26060.102", "runtimes": { "dotnet": [ "$(MicrosoftNETCorePlatformsVersion)" @@ -18,7 +18,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25578.104", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25578.104" + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26064.107", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26064.107" } } diff --git a/src/EFCore.Design/build/net10.0/Microsoft.EntityFrameworkCore.Design.props b/src/EFCore.Design/build/net11.0/Microsoft.EntityFrameworkCore.Design.props similarity index 100% rename from src/EFCore.Design/build/net10.0/Microsoft.EntityFrameworkCore.Design.props rename to src/EFCore.Design/build/net11.0/Microsoft.EntityFrameworkCore.Design.props diff --git a/src/EFCore.SqlServer.HierarchyId/build/net10.0/Microsoft.EntityFrameworkCore.SqlServer.HierarchyId.targets b/src/EFCore.SqlServer.HierarchyId/build/net11.0/Microsoft.EntityFrameworkCore.SqlServer.HierarchyId.targets similarity index 100% rename from src/EFCore.SqlServer.HierarchyId/build/net10.0/Microsoft.EntityFrameworkCore.SqlServer.HierarchyId.targets rename to src/EFCore.SqlServer.HierarchyId/build/net11.0/Microsoft.EntityFrameworkCore.SqlServer.HierarchyId.targets diff --git a/src/EFCore.SqlServer.NTS/build/net10.0/Microsoft.EntityFrameworkCore.SqlServer.NetTopologySuite.targets b/src/EFCore.SqlServer.NTS/build/net11.0/Microsoft.EntityFrameworkCore.SqlServer.NetTopologySuite.targets similarity index 100% rename from src/EFCore.SqlServer.NTS/build/net10.0/Microsoft.EntityFrameworkCore.SqlServer.NetTopologySuite.targets rename to src/EFCore.SqlServer.NTS/build/net11.0/Microsoft.EntityFrameworkCore.SqlServer.NetTopologySuite.targets diff --git a/src/EFCore.Sqlite.NTS/build/net10.0/Microsoft.EntityFrameworkCore.Sqlite.NetTopologySuite.targets b/src/EFCore.Sqlite.NTS/build/net11.0/Microsoft.EntityFrameworkCore.Sqlite.NetTopologySuite.targets similarity index 100% rename from src/EFCore.Sqlite.NTS/build/net10.0/Microsoft.EntityFrameworkCore.Sqlite.NetTopologySuite.targets rename to src/EFCore.Sqlite.NTS/build/net11.0/Microsoft.EntityFrameworkCore.Sqlite.NetTopologySuite.targets diff --git a/src/EFCore.Sqlite/lib/net10.0/_._ b/src/EFCore.Sqlite/lib/net11.0/_._ similarity index 100% rename from src/EFCore.Sqlite/lib/net10.0/_._ rename to src/EFCore.Sqlite/lib/net11.0/_._ diff --git a/src/EFCore.Tasks/EFCore.Tasks.csproj b/src/EFCore.Tasks/EFCore.Tasks.csproj index e1a280c9a52..305ea822e58 100644 --- a/src/EFCore.Tasks/EFCore.Tasks.csproj +++ b/src/EFCore.Tasks/EFCore.Tasks.csproj @@ -1,8 +1,8 @@  + $(NetCurrent);$(NetFrameworkToolCurrent) MSBuild tasks for Entity Framework Core projects. - $(NetToolCurrent);net472 Microsoft.EntityFrameworkCore.Tasks Microsoft.EntityFrameworkCore false @@ -48,11 +48,11 @@ - + - + @@ -74,10 +74,9 @@ - - - - + + + diff --git a/src/EFCore.Tasks/EFCore.Tasks.nuspec b/src/EFCore.Tasks/EFCore.Tasks.nuspec index aad830e70a4..1bdc73455cf 100644 --- a/src/EFCore.Tasks/EFCore.Tasks.nuspec +++ b/src/EFCore.Tasks/EFCore.Tasks.nuspec @@ -4,7 +4,7 @@ $CommonMetadataElements$ - + @@ -13,11 +13,11 @@ $CommonFileElements$ - - - - - + + + + + \ No newline at end of file diff --git a/src/EFCore.Tasks/Tasks/Internal/OperationTaskBase.cs b/src/EFCore.Tasks/Tasks/Internal/OperationTaskBase.cs index 4e10cd493c0..ea38e491b56 100644 --- a/src/EFCore.Tasks/Tasks/Internal/OperationTaskBase.cs +++ b/src/EFCore.Tasks/Tasks/Internal/OperationTaskBase.cs @@ -199,7 +199,7 @@ protected override string GenerateCommandLineCommands() } #if NET472 -#elif NET10_0 +#elif NET11_0 #else #error Target framework needs to be updated here #endif @@ -209,7 +209,7 @@ protected override string GenerateCommandLineCommands() "..", "..", "tools", - "net10.0", + "net11.0", "ef.dll")); args.AddRange(AdditionalArguments); diff --git a/src/EFCore.Tasks/buildTransitive/Microsoft.EntityFrameworkCore.Tasks.props b/src/EFCore.Tasks/buildTransitive/Microsoft.EntityFrameworkCore.Tasks.props index 4d31d5d7b25..1d0add9c50e 100644 --- a/src/EFCore.Tasks/buildTransitive/Microsoft.EntityFrameworkCore.Tasks.props +++ b/src/EFCore.Tasks/buildTransitive/Microsoft.EntityFrameworkCore.Tasks.props @@ -2,7 +2,7 @@ - <_TaskTargetFramework Condition="'$(MSBuildRuntimeType)' == 'Core'">net10.0 + <_TaskTargetFramework Condition="'$(MSBuildRuntimeType)' == 'Core'">net11.0 <_TaskTargetFramework Condition="'$(MSBuildRuntimeType)' != 'Core'">net472 <_EFCustomTasksAssembly>$([MSBuild]::NormalizePath($(MSBuildThisFileDirectory),'..\tasks\$(_TaskTargetFramework)\$(MSBuildThisFileName).dll')) publish diff --git a/src/EFCore.Tools/tools/EntityFrameworkCore.psm1 b/src/EFCore.Tools/tools/EntityFrameworkCore.psm1 index c53ac88dafd..f236877f45c 100644 --- a/src/EFCore.Tools/tools/EntityFrameworkCore.psm1 +++ b/src/EFCore.Tools/tools/EntityFrameworkCore.psm1 @@ -1253,7 +1253,7 @@ function EF($project, $startupProject, $params, $applicationArgs, [switch] $skip $projectAssetsFile = GetCpsProperty $startupProject 'ProjectAssetsFile' $runtimeConfig = Join-Path $targetDir ($startupTargetName + '.runtimeconfig.json') $runtimeFrameworkVersion = GetCpsProperty $startupProject 'RuntimeFrameworkVersion' - $efPath = Join-Path $PSScriptRoot 'net8.0\any\ef.dll' + $efPath = Join-Path $PSScriptRoot 'net10.0\any\ef.dll' $dotnetParams = 'exec', '--depsfile', $depsFile diff --git a/src/EFCore/buildTransitive/net10.0/Microsoft.EntityFrameworkCore.props b/src/EFCore/buildTransitive/net11.0/Microsoft.EntityFrameworkCore.props similarity index 100% rename from src/EFCore/buildTransitive/net10.0/Microsoft.EntityFrameworkCore.props rename to src/EFCore/buildTransitive/net11.0/Microsoft.EntityFrameworkCore.props diff --git a/src/dotnet-ef/RootCommand.cs b/src/dotnet-ef/RootCommand.cs index 686ea398b30..f2ab26589a9 100644 --- a/src/dotnet-ef/RootCommand.cs +++ b/src/dotnet-ef/RootCommand.cs @@ -172,10 +172,10 @@ protected override int Execute(string[] _) args.Add(startupProject.RuntimeFrameworkVersion); } -#if !NET8_0 +#if !NET10_0 #error Target framework needs to be updated here, as well as in Microsoft.EntityFrameworkCore.Tasks.props and EntityFrameworkCore.psm1 #endif - args.Add(Path.Combine(toolsPath, "net8.0", "any", "ef.dll")); + args.Add(Path.Combine(toolsPath, "net10.0", "any", "ef.dll")); } else if (targetFramework.Identifier == ".NETStandard") { diff --git a/startvs.cmd b/startvs.cmd index b54bcc78e60..6c52fa44209 100644 --- a/startvs.cmd +++ b/startvs.cmd @@ -5,9 +5,6 @@ :: This tells .NET Core to use .dotnet\dotnet.exe SET DOTNET_ROOT=%~dp0.dotnet\ -:: This tells .NET Core not to go looking for .NET Core in other places -SET DOTNET_MULTILEVEL_LOOKUP=0 - :: Put our local dotnet.exe on PATH first so Visual Studio knows which one to use SET PATH=%DOTNET_ROOT%;%PATH% diff --git a/test/Directory.Build.props b/test/Directory.Build.props index 7a6f6156093..cfd767dcf83 100644 --- a/test/Directory.Build.props +++ b/test/Directory.Build.props @@ -5,8 +5,7 @@ $(NoWarn);CA1707;1591;xUnit1000;xUnit1003;xUnit1004;xUnit1010;xUnit1013;xUnit1026;xUnit2013;xUnit1024 $(MSBuildThisFileDirectory)..\rulesets\EFCore.test.ruleset preview - net10.0 false - \ No newline at end of file + diff --git a/test/EFCore.SqlServer.HierarchyId.Tests/EFCore.SqlServer.HierarchyId.Tests.csproj b/test/EFCore.SqlServer.HierarchyId.Tests/EFCore.SqlServer.HierarchyId.Tests.csproj index 10addb45d11..8b60caddb2d 100644 --- a/test/EFCore.SqlServer.HierarchyId.Tests/EFCore.SqlServer.HierarchyId.Tests.csproj +++ b/test/EFCore.SqlServer.HierarchyId.Tests/EFCore.SqlServer.HierarchyId.Tests.csproj @@ -14,6 +14,6 @@ - +