diff --git a/Directory.Build.props b/Directory.Build.props
index ea12ca71919bc1..e49bef7c61955d 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -53,7 +53,7 @@
net$(NetCoreAppCurrentVersion)
net6.0
- 6.0
+ 7.0
net$(NetCoreAppToolCurrentVersion)
$(NetCoreAppCurrentIdentifier),Version=v$(NetCoreAppToolCurrentVersion)
@@ -68,6 +68,12 @@
net472
+
+ $(NetFrameworkToolCurrent)
+
+
+
+ $(NetCoreAppToolCurrent)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 4a0f42c9def382..97ff1407d1f229 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -4,13 +4,13 @@
https://github.com/dotnet/icu
50877d02014f8d6540a3c056feb34bf912c92141
-
+
https://github.com/dotnet/msquic
- 03def3e4f051aa09f9642a6a839a0c806682536e
+ 417bdeac3988ec59ee7f6c045ae03d2193bcdab0
-
+
https://github.com/dotnet/emsdk
- ac46fa88e66788611803e55bb856bd9b508183c9
+ eb809c8854de4d1bdf227a55550af01a1bb38e4b
https://github.com/dotnet/wcf
@@ -54,77 +54,77 @@
-
+
https://github.com/dotnet/arcade
- 1527dc867ccb652def4c0f57fbd2ebbed3a94019
+ e0b311bcd81fc9e27bcf7715dcda62fa38dfa49a
-
+
https://github.com/dotnet/arcade
- 1527dc867ccb652def4c0f57fbd2ebbed3a94019
+ e0b311bcd81fc9e27bcf7715dcda62fa38dfa49a
-
+
https://github.com/dotnet/arcade
- 1527dc867ccb652def4c0f57fbd2ebbed3a94019
+ e0b311bcd81fc9e27bcf7715dcda62fa38dfa49a
-
+
https://github.com/dotnet/arcade
- 1527dc867ccb652def4c0f57fbd2ebbed3a94019
+ e0b311bcd81fc9e27bcf7715dcda62fa38dfa49a
-
+
https://github.com/dotnet/arcade
- 1527dc867ccb652def4c0f57fbd2ebbed3a94019
+ e0b311bcd81fc9e27bcf7715dcda62fa38dfa49a
-
+
https://github.com/dotnet/arcade
- 1527dc867ccb652def4c0f57fbd2ebbed3a94019
+ e0b311bcd81fc9e27bcf7715dcda62fa38dfa49a
-
+
https://github.com/dotnet/arcade
- 1527dc867ccb652def4c0f57fbd2ebbed3a94019
+ e0b311bcd81fc9e27bcf7715dcda62fa38dfa49a
-
+
https://github.com/dotnet/arcade
- 1527dc867ccb652def4c0f57fbd2ebbed3a94019
+ e0b311bcd81fc9e27bcf7715dcda62fa38dfa49a
-
+
https://github.com/dotnet/arcade
- 1527dc867ccb652def4c0f57fbd2ebbed3a94019
+ e0b311bcd81fc9e27bcf7715dcda62fa38dfa49a
-
+
https://github.com/dotnet/arcade
- 1527dc867ccb652def4c0f57fbd2ebbed3a94019
+ e0b311bcd81fc9e27bcf7715dcda62fa38dfa49a
-
+
https://github.com/dotnet/arcade
- 1527dc867ccb652def4c0f57fbd2ebbed3a94019
+ e0b311bcd81fc9e27bcf7715dcda62fa38dfa49a
-
+
https://github.com/dotnet/arcade
- 1527dc867ccb652def4c0f57fbd2ebbed3a94019
+ e0b311bcd81fc9e27bcf7715dcda62fa38dfa49a
-
+
https://github.com/dotnet/arcade
- 1527dc867ccb652def4c0f57fbd2ebbed3a94019
+ e0b311bcd81fc9e27bcf7715dcda62fa38dfa49a
-
+
https://github.com/dotnet/arcade
- 1527dc867ccb652def4c0f57fbd2ebbed3a94019
+ e0b311bcd81fc9e27bcf7715dcda62fa38dfa49a
-
+
https://github.com/dotnet/arcade
- 1527dc867ccb652def4c0f57fbd2ebbed3a94019
+ e0b311bcd81fc9e27bcf7715dcda62fa38dfa49a
-
+
https://github.com/dotnet/arcade
- 1527dc867ccb652def4c0f57fbd2ebbed3a94019
+ e0b311bcd81fc9e27bcf7715dcda62fa38dfa49a
-
+
https://github.com/dotnet/arcade
- 1527dc867ccb652def4c0f57fbd2ebbed3a94019
+ e0b311bcd81fc9e27bcf7715dcda62fa38dfa49a
-
+
https://github.com/dotnet/arcade
- 1527dc867ccb652def4c0f57fbd2ebbed3a94019
+ e0b311bcd81fc9e27bcf7715dcda62fa38dfa49a
https://github.com/microsoft/vstest
@@ -250,9 +250,9 @@
https://github.com/dotnet/xharness
f9a28aefa80424a69f3ce16e845c4e01e5d8c17e
-
+
https://github.com/dotnet/arcade
- 1527dc867ccb652def4c0f57fbd2ebbed3a94019
+ e0b311bcd81fc9e27bcf7715dcda62fa38dfa49a
https://dev.azure.com/dnceng/internal/_git/dotnet-optimization
diff --git a/eng/Versions.props b/eng/Versions.props
index b5772aa508a4fe..5891bb86b69b42 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -53,22 +53,22 @@
2.0.0-alpha.1.21525.11
- 7.0.0-beta.22179.1
- 7.0.0-beta.22179.1
- 7.0.0-beta.22179.1
- 7.0.0-beta.22179.1
- 7.0.0-beta.22179.1
- 7.0.0-beta.22179.1
- 2.5.1-beta.22179.1
- 7.0.0-beta.22179.1
- 7.0.0-beta.22179.1
- 7.0.0-beta.22179.1
- 7.0.0-beta.22179.1
- 7.0.0-beta.22179.1
- 7.0.0-beta.22179.1
- 7.0.0-beta.22179.1
- 7.0.0-beta.22179.1
- 7.0.0-beta.22179.1
+ 7.0.0-beta.22181.2
+ 7.0.0-beta.22181.2
+ 7.0.0-beta.22181.2
+ 7.0.0-beta.22181.2
+ 7.0.0-beta.22181.2
+ 7.0.0-beta.22181.2
+ 2.5.1-beta.22181.2
+ 7.0.0-beta.22181.2
+ 7.0.0-beta.22181.2
+ 7.0.0-beta.22181.2
+ 7.0.0-beta.22181.2
+ 7.0.0-beta.22181.2
+ 7.0.0-beta.22181.2
+ 7.0.0-beta.22181.2
+ 7.0.0-beta.22181.2
+ 7.0.0-beta.22181.2
6.0.0-preview.1.102
@@ -181,7 +181,7 @@
7.0.0-preview.4.22178.2
- 7.0.0-alpha.1.22173.2
+ 7.0.0-alpha.1.22181.2
11.1.0-alpha.1.22178.2
11.1.0-alpha.1.22178.2
@@ -192,7 +192,7 @@
11.1.0-alpha.1.22178.2
11.1.0-alpha.1.22178.2
- 7.0.0-preview.4.22178.1
+ 7.0.0-preview.4.22201.2
$(MicrosoftNETWorkloadEmscriptenManifest70100Version)
1.1.87-gba258badda
diff --git a/global.json b/global.json
index bb908a3d373dd8..4a2d5a91e85019 100644
--- a/global.json
+++ b/global.json
@@ -1,16 +1,16 @@
{
"sdk": {
- "version": "6.0.100",
+ "version": "7.0.100-preview.2.22153.17",
"allowPrerelease": true,
"rollForward": "major"
},
"tools": {
- "dotnet": "6.0.100"
+ "dotnet": "7.0.100-preview.2.22153.17"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22179.1",
- "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22179.1",
- "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22179.1",
+ "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22181.2",
+ "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22181.2",
+ "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22181.2",
"Microsoft.Build.NoTargets": "3.3.0",
"Microsoft.Build.Traversal": "3.1.6",
"Microsoft.NET.Sdk.IL": "7.0.0-preview.3.22171.1"
diff --git a/src/libraries/sendtohelixhelp.proj b/src/libraries/sendtohelixhelp.proj
index 5b4e1d4831f1ac..6ee54596840d48 100644
--- a/src/libraries/sendtohelixhelp.proj
+++ b/src/libraries/sendtohelixhelp.proj
@@ -143,11 +143,6 @@
sdk
-
- $([System.IO.File]::ReadAllText('$(RepoRoot)global.json'))
- $([System.Text.RegularExpressions.Regex]::Match($(GlobalJsonContent), '(%3F<="dotnet": ").*(%3F=")'))
-
-
@@ -156,6 +151,11 @@
+
+ $([System.IO.File]::ReadAllText('$(RepoRoot)global.json'))
+ $([System.Text.RegularExpressions.Regex]::Match($(GlobalJsonContent), '(%3F<="dotnet": ").*(%3F=")'))
+
+
@(HelixPreCommand)
$(HelixCommandPrefix) @(HelixCommandPrefixItem -> 'set "%(Identity)"', ' & ')
diff --git a/src/mono/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/Microsoft.NET.Runtime.MonoAOTCompiler.Task.pkgproj b/src/mono/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/Microsoft.NET.Runtime.MonoAOTCompiler.Task.pkgproj
index 1cf00b6a1ede1e..e5a5b52244306c 100644
--- a/src/mono/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/Microsoft.NET.Runtime.MonoAOTCompiler.Task.pkgproj
+++ b/src/mono/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/Microsoft.NET.Runtime.MonoAOTCompiler.Task.pkgproj
@@ -8,9 +8,28 @@
-
+
+
+ $(IntermediateOutputPath)Sdk.props
+
+
+
+ <_ReplacementValue Include="TargetFrameworkForNETCoreTasks" Value="$(TargetFrameworkForNETCoreTasks)" />
+ <_ReplacementValue Include="TargetFrameworkForNETFrameworkTasks" Value="$(TargetFrameworkForNETFrameworkTasks)" />
+
+
+
+
+
+
+
+
+
diff --git a/src/mono/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/Sdk/Sdk.props b/src/mono/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/Sdk/Sdk.props
deleted file mode 100644
index a94224b1858fea..00000000000000
--- a/src/mono/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/Sdk/Sdk.props
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
- $(MSBuildThisFileDirectory)..\tasks\net6.0\MonoAOTCompiler.dll
- $(MSBuildThisFileDirectory)..\tasks\net472\MonoAOTCompiler.dll
-
-
-
diff --git a/src/mono/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/Sdk/Sdk.props.in b/src/mono/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/Sdk/Sdk.props.in
new file mode 100644
index 00000000000000..bc14a619299e1e
--- /dev/null
+++ b/src/mono/nuget/Microsoft.NET.Runtime.MonoAOTCompiler.Task/Sdk/Sdk.props.in
@@ -0,0 +1,7 @@
+
+
+ $(MSBuildThisFileDirectory)..\tasks\${TargetFrameworkForNETCoreTasks}\MonoAOTCompiler.dll
+ $(MSBuildThisFileDirectory)..\tasks\${TargetFrameworkForNETFrameworkTasks}\MonoAOTCompiler.dll
+
+
+
diff --git a/src/mono/nuget/Microsoft.NET.Runtime.MonoTargets.Sdk/Microsoft.NET.Runtime.MonoTargets.Sdk.pkgproj b/src/mono/nuget/Microsoft.NET.Runtime.MonoTargets.Sdk/Microsoft.NET.Runtime.MonoTargets.Sdk.pkgproj
index a38b1d301e61d2..8d9e3dea06baf8 100644
--- a/src/mono/nuget/Microsoft.NET.Runtime.MonoTargets.Sdk/Microsoft.NET.Runtime.MonoTargets.Sdk.pkgproj
+++ b/src/mono/nuget/Microsoft.NET.Runtime.MonoTargets.Sdk/Microsoft.NET.Runtime.MonoTargets.Sdk.pkgproj
@@ -13,9 +13,28 @@
-
+
+
+ $(IntermediateOutputPath)MonoTargetsTasks.props
+
+
+
+ <_ReplacementValue Include="TargetFrameworkForNETCoreTasks" Value="$(TargetFrameworkForNETCoreTasks)" />
+ <_ReplacementValue Include="TargetFrameworkForNETFrameworkTasks" Value="$(TargetFrameworkForNETFrameworkTasks)" />
+
+
+
+
+
+
+
+
+
diff --git a/src/mono/nuget/Microsoft.NET.Runtime.MonoTargets.Sdk/Sdk/MonoTargetsTasks.props b/src/mono/nuget/Microsoft.NET.Runtime.MonoTargets.Sdk/Sdk/MonoTargetsTasks.props.in
similarity index 81%
rename from src/mono/nuget/Microsoft.NET.Runtime.MonoTargets.Sdk/Sdk/MonoTargetsTasks.props
rename to src/mono/nuget/Microsoft.NET.Runtime.MonoTargets.Sdk/Sdk/MonoTargetsTasks.props.in
index 7fe32897283ba8..4ef325f421be72 100644
--- a/src/mono/nuget/Microsoft.NET.Runtime.MonoTargets.Sdk/Sdk/MonoTargetsTasks.props
+++ b/src/mono/nuget/Microsoft.NET.Runtime.MonoTargets.Sdk/Sdk/MonoTargetsTasks.props.in
@@ -1,7 +1,7 @@
- $(MSBuildThisFileDirectory)..\tasks\net6.0\MonoTargetsTasks.dll
- $(MSBuildThisFileDirectory)..\tasks\net472\MonoTargetsTasks.dll
+ $(MSBuildThisFileDirectory)..\tasks\${TargetFrameworkForNETCoreTasks}\MonoTargetsTasks.dll
+ $(MSBuildThisFileDirectory)..\tasks\${TargetFrameworkForNETFrameworkTasks}\MonoTargetsTasks.dll
diff --git a/src/mono/nuget/Microsoft.NET.Runtime.WebAssembly.Sdk/Microsoft.NET.Runtime.WebAssembly.Sdk.pkgproj b/src/mono/nuget/Microsoft.NET.Runtime.WebAssembly.Sdk/Microsoft.NET.Runtime.WebAssembly.Sdk.pkgproj
index 874775fe7e47f2..3116e9955cfcd3 100644
--- a/src/mono/nuget/Microsoft.NET.Runtime.WebAssembly.Sdk/Microsoft.NET.Runtime.WebAssembly.Sdk.pkgproj
+++ b/src/mono/nuget/Microsoft.NET.Runtime.WebAssembly.Sdk/Microsoft.NET.Runtime.WebAssembly.Sdk.pkgproj
@@ -9,7 +9,6 @@
-
@@ -17,5 +16,25 @@
+
+
+ $(IntermediateOutputPath)Sdk.targets
+
+
+
+ <_ReplacementValue Include="TargetFrameworkForNETCoreTasks" Value="$(TargetFrameworkForNETCoreTasks)" />
+ <_ReplacementValue Include="TargetFrameworkForNETFrameworkTasks" Value="$(TargetFrameworkForNETFrameworkTasks)" />
+
+
+
+
+
+
+
+
+
diff --git a/src/mono/nuget/Microsoft.NET.Runtime.WebAssembly.Sdk/Sdk/Sdk.targets b/src/mono/nuget/Microsoft.NET.Runtime.WebAssembly.Sdk/Sdk/Sdk.targets.in
similarity index 76%
rename from src/mono/nuget/Microsoft.NET.Runtime.WebAssembly.Sdk/Sdk/Sdk.targets
rename to src/mono/nuget/Microsoft.NET.Runtime.WebAssembly.Sdk/Sdk/Sdk.targets.in
index 2c2959c87e53a4..0a6137cd8c4edd 100644
--- a/src/mono/nuget/Microsoft.NET.Runtime.WebAssembly.Sdk/Sdk/Sdk.targets
+++ b/src/mono/nuget/Microsoft.NET.Runtime.WebAssembly.Sdk/Sdk/Sdk.targets.in
@@ -1,8 +1,8 @@
- <_TasksDir Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tasks\net6.0\
- <_TasksDir Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tasks\net472\
+ <_TasksDir Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tasks\${TargetFrameworkForNETCoreTasks}\
+ <_TasksDir Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tasks\${TargetFrameworkForNETFrameworkTasks}\
$(_TasksDir)WasmAppBuilder.dll
$(_TasksDir)WasmBuildTasks.dll
diff --git a/src/mono/wasm/build/WasmApp.LocalBuild.props b/src/mono/wasm/build/WasmApp.LocalBuild.props
index 939d6ce4eef85a..6cbb86d94e7f51 100644
--- a/src/mono/wasm/build/WasmApp.LocalBuild.props
+++ b/src/mono/wasm/build/WasmApp.LocalBuild.props
@@ -22,7 +22,7 @@
- <_TargetFrameworkForNETCoreTasks>net6.0
+ <_TargetFrameworkForNETCoreTasks>net7.0
false
diff --git a/src/tasks/Directory.Build.props b/src/tasks/Directory.Build.props
deleted file mode 100644
index 887be3a86036fb..00000000000000
--- a/src/tasks/Directory.Build.props
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
- net472
-
-
-
- net6.0
-
-
diff --git a/src/tasks/MonoTargetsTasks/ILStrip/AssemblyStripper/AssemblyStripper.csproj b/src/tasks/MonoTargetsTasks/ILStrip/AssemblyStripper/AssemblyStripper.csproj
index 439b5b8b21b98c..f038ae6192f07c 100644
--- a/src/tasks/MonoTargetsTasks/ILStrip/AssemblyStripper/AssemblyStripper.csproj
+++ b/src/tasks/MonoTargetsTasks/ILStrip/AssemblyStripper/AssemblyStripper.csproj
@@ -4,11 +4,10 @@
false
disable
-
- $(NoWarn),CS0618,CS0649,SYSLIB0003
+ $(NoWarn),CS0618,CS0649,SYSLIB0003,SYSLIB0037
false
diff --git a/src/tests/tracing/eventpipe/common/Microsoft.Diagnostics.NETCore.Client/DiagnosticsIpc/IpcSocket.cs b/src/tests/tracing/eventpipe/common/Microsoft.Diagnostics.NETCore.Client/DiagnosticsIpc/IpcSocket.cs
index 27b0b07d683243..921ebc2dddb96b 100644
--- a/src/tests/tracing/eventpipe/common/Microsoft.Diagnostics.NETCore.Client/DiagnosticsIpc/IpcSocket.cs
+++ b/src/tests/tracing/eventpipe/common/Microsoft.Diagnostics.NETCore.Client/DiagnosticsIpc/IpcSocket.cs
@@ -23,7 +23,7 @@ public IpcSocket(AddressFamily addressFamily, SocketType socketType, ProtocolTyp
}
// .NET 6 implements this method directly on Socket, but for earlier runtimes we need a polyfill
-#if !NET6_0
+#if !NET6_0_OR_GREATER
public async Task AcceptAsync(CancellationToken token)
{
using (token.Register(() => Close(0)))
@@ -63,7 +63,7 @@ public virtual void Connect(EndPoint remoteEP, TimeSpan timeout)
}
// .NET 6 implements this method directly on Socket, but for earlier runtimes we need a polyfill
-#if !NET6_0
+#if !NET6_0_OR_GREATER
public async Task ConnectAsync(EndPoint remoteEP, CancellationToken token)
{
using (token.Register(() => Close(0)))