diff --git a/Directory.Build.targets b/Directory.Build.targets
index 13d1fdd839a..c4abaaae764 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -11,7 +11,7 @@
ExcludeAssets="runtime"
VersionOverride="2.0.3"
Condition="'$(TargetFrameworkIdentifier)' != '.NETStandard' and
- $([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'netstandard2.0'))" />
+ '$(SkipNETStandardLibraryPackageAutoInclude)' != 'true'" />
diff --git a/eng/Microsoft.DotNet.XliffTasks.InTree.targets b/eng/Microsoft.DotNet.XliffTasks.InTree.targets
index 40c87b5ef26..f9eacf484bf 100644
--- a/eng/Microsoft.DotNet.XliffTasks.InTree.targets
+++ b/eng/Microsoft.DotNet.XliffTasks.InTree.targets
@@ -4,7 +4,7 @@
$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'Microsoft.DotNet.XliffTasks'))
$(ArtifactsBinDir)Microsoft.DotNet.XliffTasks\$(Configuration)\
- $(XliffTasksBaseOutputDirectory)$(NetCurrent)\
+ $(XliffTasksBaseOutputDirectory)$(NetToolCurrent)\
$(XliffTasksBaseOutputDirectory)$(NetFrameworkToolCurrent)\
TaskHostFactory
@@ -25,7 +25,7 @@
PrivateAssets="all"
Private="false">
- TargetFramework=$(NetCurrent)
+ TargetFramework=$(NetToolCurrent)
TargetFramework=$(NetFrameworkToolCurrent)
diff --git a/src/Common/Microsoft.Arcade.Common.Tests/Microsoft.Arcade.Common.Tests.csproj b/src/Common/Microsoft.Arcade.Common.Tests/Microsoft.Arcade.Common.Tests.csproj
index 8de4057cbd2..c4a734447c4 100644
--- a/src/Common/Microsoft.Arcade.Common.Tests/Microsoft.Arcade.Common.Tests.csproj
+++ b/src/Common/Microsoft.Arcade.Common.Tests/Microsoft.Arcade.Common.Tests.csproj
@@ -1,7 +1,7 @@
- $(NetCurrent)
+ $(NetToolCurrent)
enable
diff --git a/src/Common/Microsoft.Arcade.Common/FileSystem.cs b/src/Common/Microsoft.Arcade.Common/FileSystem.cs
index 1c9ab5939d4..f805c773d97 100644
--- a/src/Common/Microsoft.Arcade.Common/FileSystem.cs
+++ b/src/Common/Microsoft.Arcade.Common/FileSystem.cs
@@ -4,6 +4,7 @@
using System.IO;
#nullable enable
+
namespace Microsoft.Arcade.Common
{
public class FileSystem : IFileSystem
@@ -28,8 +29,8 @@ public class FileSystem : IFileSystem
public void WriteToFile(string path, string content)
{
- string dirPath = Path.GetDirectoryName(path);
- Directory.CreateDirectory(dirPath);
+ string? dirPath = Path.GetDirectoryName(path);
+ Directory.CreateDirectory(dirPath!);
File.WriteAllText(path, content);
}
diff --git a/src/Common/Microsoft.Arcade.Common/Microsoft.Arcade.Common.csproj b/src/Common/Microsoft.Arcade.Common/Microsoft.Arcade.Common.csproj
index 1f31b4bc81b..39cef0515b4 100644
--- a/src/Common/Microsoft.Arcade.Common/Microsoft.Arcade.Common.csproj
+++ b/src/Common/Microsoft.Arcade.Common/Microsoft.Arcade.Common.csproj
@@ -1,7 +1,8 @@
- netstandard2.0;$(NetFrameworkToolCurrent)
+
+ $(NetToolCurrent);netstandard2.0;$(NetFrameworkToolCurrent)
true
**/*.Desktop.*
diff --git a/src/Common/Microsoft.Arcade.Test.Common/Microsoft.Arcade.Test.Common.csproj b/src/Common/Microsoft.Arcade.Test.Common/Microsoft.Arcade.Test.Common.csproj
index 37214a503e1..4867a58638f 100644
--- a/src/Common/Microsoft.Arcade.Test.Common/Microsoft.Arcade.Test.Common.csproj
+++ b/src/Common/Microsoft.Arcade.Test.Common/Microsoft.Arcade.Test.Common.csproj
@@ -1,7 +1,7 @@
- $(NetCurrent);$(NetFrameworkToolCurrent)
+ $(NetToolCurrent);$(NetFrameworkToolCurrent)
true
diff --git a/src/Microsoft.Cci.Extensions/Microsoft.Cci.Extensions.csproj b/src/Microsoft.Cci.Extensions/Microsoft.Cci.Extensions.csproj
index 0132ac4407a..451a72a9cf3 100644
--- a/src/Microsoft.Cci.Extensions/Microsoft.Cci.Extensions.csproj
+++ b/src/Microsoft.Cci.Extensions/Microsoft.Cci.Extensions.csproj
@@ -1,7 +1,8 @@
- $(NetCurrent);netstandard2.0
+
+ $(NetToolCurrent);netstandard2.0;$(NetFrameworkToolCurrent)
true
true
true
@@ -19,9 +20,13 @@
-
+
+
+
+
+
diff --git a/src/Microsoft.DotNet.Arcade.Sdk.Tests/Microsoft.DotNet.Arcade.Sdk.Tests.csproj b/src/Microsoft.DotNet.Arcade.Sdk.Tests/Microsoft.DotNet.Arcade.Sdk.Tests.csproj
index 73aa63d1570..01234e4c065 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk.Tests/Microsoft.DotNet.Arcade.Sdk.Tests.csproj
+++ b/src/Microsoft.DotNet.Arcade.Sdk.Tests/Microsoft.DotNet.Arcade.Sdk.Tests.csproj
@@ -1,7 +1,7 @@
- $(NetCurrent)
+ $(NetToolCurrent)
$(DefaultItemExcludes);testassets\**\*
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/Microsoft.DotNet.Arcade.Sdk.csproj b/src/Microsoft.DotNet.Arcade.Sdk/Microsoft.DotNet.Arcade.Sdk.csproj
index 5fbfa85f3c2..c2b1f00cfba 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/Microsoft.DotNet.Arcade.Sdk.csproj
+++ b/src/Microsoft.DotNet.Arcade.Sdk/Microsoft.DotNet.Arcade.Sdk.csproj
@@ -1,9 +1,8 @@
- $(NetCurrent);$(NetFrameworkToolCurrent)
+ $(NetToolCurrent);$(NetFrameworkToolCurrent)
true
- false
true
@@ -44,8 +43,6 @@
-
-
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/Imports.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/Imports.targets
index 55224609d86..2bbcc145865 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/Imports.targets
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/Imports.targets
@@ -1,5 +1,6 @@
+
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/TargetFrameworkDefaults.props b/src/Microsoft.DotNet.Arcade.Sdk/tools/TargetFrameworkDefaults.props
index dc4f3eb0f24..e399065249a 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/TargetFrameworkDefaults.props
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/TargetFrameworkDefaults.props
@@ -38,7 +38,7 @@
- net6.0
+ net8.0
net472
diff --git a/src/Microsoft.DotNet.ArcadeLogging/Microsoft.DotNet.ArcadeLogging.csproj b/src/Microsoft.DotNet.ArcadeLogging/Microsoft.DotNet.ArcadeLogging.csproj
index ed3058f940f..66710e1db8f 100644
--- a/src/Microsoft.DotNet.ArcadeLogging/Microsoft.DotNet.ArcadeLogging.csproj
+++ b/src/Microsoft.DotNet.ArcadeLogging/Microsoft.DotNet.ArcadeLogging.csproj
@@ -1,8 +1,7 @@
- netstandard2.0
- true
+ $(NetToolCurrent);$(NetFrameworkToolCurrent)
diff --git a/src/Microsoft.DotNet.ArcadeLogging/PipelinesLogger.cs b/src/Microsoft.DotNet.ArcadeLogging/PipelinesLogger.cs
index 78157f2c206..991051f16fa 100644
--- a/src/Microsoft.DotNet.ArcadeLogging/PipelinesLogger.cs
+++ b/src/Microsoft.DotNet.ArcadeLogging/PipelinesLogger.cs
@@ -1,12 +1,12 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
-using Microsoft.Build.Framework;
using System;
+using System.Collections;
using System.Collections.Generic;
-using System.Linq;
using System.IO;
-using System.Collections;
+using System.Linq;
+using Microsoft.Build.Framework;
namespace Microsoft.DotNet.ArcadeLogging
{
diff --git a/src/Microsoft.DotNet.AsmDiff/Microsoft.DotNet.AsmDiff.csproj b/src/Microsoft.DotNet.AsmDiff/Microsoft.DotNet.AsmDiff.csproj
index 66c20be3a6b..9c73adc5146 100644
--- a/src/Microsoft.DotNet.AsmDiff/Microsoft.DotNet.AsmDiff.csproj
+++ b/src/Microsoft.DotNet.AsmDiff/Microsoft.DotNet.AsmDiff.csproj
@@ -2,7 +2,7 @@
- $(NetCurrent)
+ $(NetToolCurrent)
Exe
true
true
diff --git a/src/Microsoft.DotNet.Build.Tasks.Archives/Microsoft.DotNet.Build.Tasks.Archives.csproj b/src/Microsoft.DotNet.Build.Tasks.Archives/Microsoft.DotNet.Build.Tasks.Archives.csproj
index d7ea82f7981..2669485325d 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Archives/Microsoft.DotNet.Build.Tasks.Archives.csproj
+++ b/src/Microsoft.DotNet.Build.Tasks.Archives/Microsoft.DotNet.Build.Tasks.Archives.csproj
@@ -1,7 +1,7 @@
- $(NetCurrent)
+ $(NetToolCurrent)
true
false
Targets for producing an archive of file outputs.
diff --git a/src/Microsoft.DotNet.Build.Tasks.Archives/build/archives.targets b/src/Microsoft.DotNet.Build.Tasks.Archives/build/archives.targets
index ad127b76886..f0812e4eb6f 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Archives/build/archives.targets
+++ b/src/Microsoft.DotNet.Build.Tasks.Archives/build/archives.targets
@@ -1,6 +1,15 @@
+
+
+ $(BuildDependsOn);
+ _GetSkipArchivesBuildProps;
+ _CreateArchive;
+ _CreateSymbolsArchive
+
+
+
-
-
- $(BuildDependsOn);
- _GetSkipArchivesBuildProps;
- _CreateArchive;
- _CreateSymbolsArchive
-
-
-
diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed.Tests/Microsoft.DotNet.Build.Tasks.Feed.Tests.csproj b/src/Microsoft.DotNet.Build.Tasks.Feed.Tests/Microsoft.DotNet.Build.Tasks.Feed.Tests.csproj
index 2936fd6e36b..dc44e0f1378 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Feed.Tests/Microsoft.DotNet.Build.Tasks.Feed.Tests.csproj
+++ b/src/Microsoft.DotNet.Build.Tasks.Feed.Tests/Microsoft.DotNet.Build.Tasks.Feed.Tests.csproj
@@ -1,7 +1,7 @@
- $(NetCurrent)
+ $(NetToolCurrent)
diff --git a/src/Microsoft.DotNet.Build.Tasks.Feed/Microsoft.DotNet.Build.Tasks.Feed.csproj b/src/Microsoft.DotNet.Build.Tasks.Feed/Microsoft.DotNet.Build.Tasks.Feed.csproj
index 35ea0e744f6..df6aafbe307 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Feed/Microsoft.DotNet.Build.Tasks.Feed.csproj
+++ b/src/Microsoft.DotNet.Build.Tasks.Feed/Microsoft.DotNet.Build.Tasks.Feed.csproj
@@ -1,7 +1,7 @@
- $(NetCurrent);$(NetFrameworkToolCurrent)
+ $(NetToolCurrent);$(NetFrameworkToolCurrent)
true
This package provides support for publishing assets to a NuGet protocol based feed.
true
diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/Microsoft.DotNet.Build.Tasks.Installers.csproj b/src/Microsoft.DotNet.Build.Tasks.Installers/Microsoft.DotNet.Build.Tasks.Installers.csproj
index a5b14da2c11..80616ce11e9 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Installers/Microsoft.DotNet.Build.Tasks.Installers.csproj
+++ b/src/Microsoft.DotNet.Build.Tasks.Installers/Microsoft.DotNet.Build.Tasks.Installers.csproj
@@ -1,7 +1,7 @@
- $(NetCurrent);$(NetFrameworkToolCurrent)
+ $(NetToolCurrent);$(NetFrameworkToolCurrent)
true
true
Installer task package
@@ -34,11 +34,6 @@
-
-
-
-
-
diff --git a/src/Microsoft.DotNet.Build.Tasks.Installers/build/wix/wix.targets b/src/Microsoft.DotNet.Build.Tasks.Installers/build/wix/wix.targets
index 6a2a4289573..d65d78ae6ae 100644
--- a/src/Microsoft.DotNet.Build.Tasks.Installers/build/wix/wix.targets
+++ b/src/Microsoft.DotNet.Build.Tasks.Installers/build/wix/wix.targets
@@ -1,4 +1,6 @@
+
+
+ $(NetToolCurrent);netstandard2.0;$(NetFrameworkToolCurrent)
true
This package provides access to the Helix Api located at https://helix.dot.net/
https://helix.dot.net/api/openapi.json
HelixApi
- true
diff --git a/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/HelixApi.cs b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/HelixApi.cs
index b0caa7bdc44..def09d88698 100644
--- a/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/HelixApi.cs
+++ b/src/Microsoft.DotNet.Helix/Client/CSharp/generated-code/HelixApi.cs
@@ -333,6 +333,9 @@ public RestApiException(Request request, Response response, string responseConte
Response = new ResponseWrapper(response, responseContent);
}
+#if NET
+ [Obsolete]
+#endif
protected RestApiException(SerializationInfo info, StreamingContext context)
: base(info, context)
{
@@ -342,6 +345,9 @@ protected RestApiException(SerializationInfo info, StreamingContext context)
Response = JsonConvert.DeserializeObject(responseString, SerializerSettings);
}
+#if NET
+ [Obsolete]
+#endif
public override void GetObjectData(SerializationInfo info, StreamingContext context)
{
if (info == null)
@@ -369,12 +375,18 @@ public RestApiException(Request request, Response response, string responseConte
Body = body;
}
+#if NET
+ [Obsolete]
+#endif
protected RestApiException(SerializationInfo info, StreamingContext context)
: base(info, context)
{
Body = JsonConvert.DeserializeObject(info.GetString("Body"));
}
+#if NET
+ [Obsolete]
+#endif
public override void GetObjectData(SerializationInfo info, StreamingContext context)
{
if (info == null)
diff --git a/src/Microsoft.DotNet.Helix/Directory.Build.props b/src/Microsoft.DotNet.Helix/Directory.Build.props
new file mode 100644
index 00000000000..46645f27313
--- /dev/null
+++ b/src/Microsoft.DotNet.Helix/Directory.Build.props
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+ true
+
+
+
diff --git a/src/Microsoft.DotNet.Helix/JobSender.Tests/Microsoft.DotNet.Helix.JobSender.Tests.csproj b/src/Microsoft.DotNet.Helix/JobSender.Tests/Microsoft.DotNet.Helix.JobSender.Tests.csproj
index 6fdaf8dcb01..63f357bd05a 100644
--- a/src/Microsoft.DotNet.Helix/JobSender.Tests/Microsoft.DotNet.Helix.JobSender.Tests.csproj
+++ b/src/Microsoft.DotNet.Helix/JobSender.Tests/Microsoft.DotNet.Helix.JobSender.Tests.csproj
@@ -1,7 +1,7 @@
- $(NetCurrent)
+ $(NetToolCurrent)
diff --git a/src/Microsoft.DotNet.Helix/JobSender/Microsoft.DotNet.Helix.JobSender.csproj b/src/Microsoft.DotNet.Helix/JobSender/Microsoft.DotNet.Helix.JobSender.csproj
index a330d81af84..86aef8f40e5 100644
--- a/src/Microsoft.DotNet.Helix/JobSender/Microsoft.DotNet.Helix.JobSender.csproj
+++ b/src/Microsoft.DotNet.Helix/JobSender/Microsoft.DotNet.Helix.JobSender.csproj
@@ -1,11 +1,11 @@
- netstandard2.0
+
+ $(NetToolCurrent);netstandard2.0;$(NetFrameworkToolCurrent)
true
Microsoft.DotNet.Helix.Client
This package provides a simple API for constructing and sending jobs to the Helix Api
- true
@@ -18,6 +18,10 @@
+
+
+
+
diff --git a/src/Microsoft.DotNet.Helix/Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests.csproj b/src/Microsoft.DotNet.Helix/Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests.csproj
index 956de775edc..970d2627c6f 100644
--- a/src/Microsoft.DotNet.Helix/Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests.csproj
+++ b/src/Microsoft.DotNet.Helix/Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests.csproj
@@ -1,7 +1,7 @@
- $(NetCurrent)
+ $(NetToolCurrent)
diff --git a/src/Microsoft.DotNet.Helix/Sdk/Microsoft.DotNet.Helix.Sdk.csproj b/src/Microsoft.DotNet.Helix/Sdk/Microsoft.DotNet.Helix.Sdk.csproj
index b47f093c0d5..9cb41ddaf45 100644
--- a/src/Microsoft.DotNet.Helix/Sdk/Microsoft.DotNet.Helix.Sdk.csproj
+++ b/src/Microsoft.DotNet.Helix/Sdk/Microsoft.DotNet.Helix.Sdk.csproj
@@ -1,10 +1,9 @@
- $(NetCurrent);$(NetFrameworkToolCurrent)
+ $(NetToolCurrent);$(NetFrameworkToolCurrent)
MSBuildSdk
**/*.Desktop.*
- true
diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/Microsoft.DotNet.Helix.Sdk.props b/src/Microsoft.DotNet.Helix/Sdk/tools/Microsoft.DotNet.Helix.Sdk.props
index d632b396fad..e5922c4c27f 100644
--- a/src/Microsoft.DotNet.Helix/Sdk/tools/Microsoft.DotNet.Helix.Sdk.props
+++ b/src/Microsoft.DotNet.Helix/Sdk/tools/Microsoft.DotNet.Helix.Sdk.props
@@ -10,7 +10,7 @@
- Helix
+ Helix
diff --git a/src/Microsoft.DotNet.Internal.DependencyInjection.Testing/Microsoft.DotNet.Internal.DependencyInjection.Testing.csproj b/src/Microsoft.DotNet.Internal.DependencyInjection.Testing/Microsoft.DotNet.Internal.DependencyInjection.Testing.csproj
index 5db0cf94959..61cf5eb57df 100644
--- a/src/Microsoft.DotNet.Internal.DependencyInjection.Testing/Microsoft.DotNet.Internal.DependencyInjection.Testing.csproj
+++ b/src/Microsoft.DotNet.Internal.DependencyInjection.Testing/Microsoft.DotNet.Internal.DependencyInjection.Testing.csproj
@@ -1,7 +1,7 @@
- $(NetCurrent)
+ $(NetToolCurrent)
diff --git a/src/Microsoft.DotNet.NuGetRepack/tasks/Microsoft.DotNet.NuGetRepack.Tasks.csproj b/src/Microsoft.DotNet.NuGetRepack/tasks/Microsoft.DotNet.NuGetRepack.Tasks.csproj
index d2601027a41..55d75b89a2c 100644
--- a/src/Microsoft.DotNet.NuGetRepack/tasks/Microsoft.DotNet.NuGetRepack.Tasks.csproj
+++ b/src/Microsoft.DotNet.NuGetRepack/tasks/Microsoft.DotNet.NuGetRepack.Tasks.csproj
@@ -1,7 +1,7 @@
- $(NetCurrent);$(NetFrameworkToolCurrent)
+ $(NetToolCurrent);$(NetFrameworkToolCurrent)
true
MSBuildSdk
Build task for updating version of NuGet packages.
diff --git a/src/Microsoft.DotNet.NuGetRepack/tests/Microsoft.DotNet.NuGetRepack.Tests.csproj b/src/Microsoft.DotNet.NuGetRepack/tests/Microsoft.DotNet.NuGetRepack.Tests.csproj
index 8a88e8b1d1d..3eb2b0b7530 100644
--- a/src/Microsoft.DotNet.NuGetRepack/tests/Microsoft.DotNet.NuGetRepack.Tests.csproj
+++ b/src/Microsoft.DotNet.NuGetRepack/tests/Microsoft.DotNet.NuGetRepack.Tests.csproj
@@ -1,7 +1,7 @@
- $(NetCurrent)
+ $(NetToolCurrent)
$(DefaultExcludesInProjectFolder);Resources\*.cs
diff --git a/src/Microsoft.DotNet.PackageTesting.Tests/Microsoft.DotNet.PackageTesting.Tests.csproj b/src/Microsoft.DotNet.PackageTesting.Tests/Microsoft.DotNet.PackageTesting.Tests.csproj
index a605c5171c9..ed72ff9eaf6 100644
--- a/src/Microsoft.DotNet.PackageTesting.Tests/Microsoft.DotNet.PackageTesting.Tests.csproj
+++ b/src/Microsoft.DotNet.PackageTesting.Tests/Microsoft.DotNet.PackageTesting.Tests.csproj
@@ -1,7 +1,7 @@
- $(NetCurrent);$(NetFrameworkToolCurrent)
+ $(NetToolCurrent);$(NetFrameworkToolCurrent)
diff --git a/src/Microsoft.DotNet.PackageTesting/Microsoft.DotNet.PackageTesting.csproj b/src/Microsoft.DotNet.PackageTesting/Microsoft.DotNet.PackageTesting.csproj
index a8ab29a3372..c3b65017e5a 100644
--- a/src/Microsoft.DotNet.PackageTesting/Microsoft.DotNet.PackageTesting.csproj
+++ b/src/Microsoft.DotNet.PackageTesting/Microsoft.DotNet.PackageTesting.csproj
@@ -1,7 +1,7 @@
- $(NetCurrent);$(NetFrameworkToolCurrent)
+ $(NetToolCurrent);$(NetFrameworkToolCurrent)
MSBuildSdk
true
diff --git a/src/Microsoft.DotNet.RemoteExecutor/src/Microsoft.DotNet.RemoteExecutor.csproj b/src/Microsoft.DotNet.RemoteExecutor/src/Microsoft.DotNet.RemoteExecutor.csproj
index 2bc32b8583e..8a76b50f650 100644
--- a/src/Microsoft.DotNet.RemoteExecutor/src/Microsoft.DotNet.RemoteExecutor.csproj
+++ b/src/Microsoft.DotNet.RemoteExecutor/src/Microsoft.DotNet.RemoteExecutor.csproj
@@ -1,7 +1,7 @@
- $(NetCurrent);$(NetFrameworkMinimum)
+ $(NetMinimum);$(NetFrameworkMinimum)
Exe
This package provides support for running tests out-of-process.
diff --git a/src/Microsoft.DotNet.RemoteExecutor/tests/Microsoft.DotNet.RemoteExecutor.Tests.csproj b/src/Microsoft.DotNet.RemoteExecutor/tests/Microsoft.DotNet.RemoteExecutor.Tests.csproj
index 266f7867d87..0db92001071 100644
--- a/src/Microsoft.DotNet.RemoteExecutor/tests/Microsoft.DotNet.RemoteExecutor.Tests.csproj
+++ b/src/Microsoft.DotNet.RemoteExecutor/tests/Microsoft.DotNet.RemoteExecutor.Tests.csproj
@@ -1,8 +1,7 @@
- $(NetCurrent)
- false
+ $(NetToolCurrent)
true
diff --git a/src/Microsoft.DotNet.SharedFramework.Sdk/Microsoft.DotNet.SharedFramework.Sdk.csproj b/src/Microsoft.DotNet.SharedFramework.Sdk/Microsoft.DotNet.SharedFramework.Sdk.csproj
index 21439f21891..91e2ca3a998 100644
--- a/src/Microsoft.DotNet.SharedFramework.Sdk/Microsoft.DotNet.SharedFramework.Sdk.csproj
+++ b/src/Microsoft.DotNet.SharedFramework.Sdk/Microsoft.DotNet.SharedFramework.Sdk.csproj
@@ -1,7 +1,7 @@
- $(NetCurrent);$(NetFrameworkToolCurrent)
+ $(NetToolCurrent);$(NetFrameworkToolCurrent)
true
Common toolset for building shared frameworks and framework packs.
MSBuildSdk
diff --git a/src/Microsoft.DotNet.SignTool.Tests/Microsoft.DotNet.SignTool.Tests.csproj b/src/Microsoft.DotNet.SignTool.Tests/Microsoft.DotNet.SignTool.Tests.csproj
index 712adb1b200..f1601325a25 100644
--- a/src/Microsoft.DotNet.SignTool.Tests/Microsoft.DotNet.SignTool.Tests.csproj
+++ b/src/Microsoft.DotNet.SignTool.Tests/Microsoft.DotNet.SignTool.Tests.csproj
@@ -1,7 +1,7 @@
- $(NetCurrent);$(NetFrameworkToolCurrent)
+ $(NetToolCurrent);$(NetFrameworkToolCurrent)
@@ -15,13 +15,12 @@
-
- false
- TargetFramework=$(NetCurrent)
- true
- false
- _TarToolPath
-
+
diff --git a/src/Microsoft.DotNet.SignTool/Microsoft.DotNet.SignTool.csproj b/src/Microsoft.DotNet.SignTool/Microsoft.DotNet.SignTool.csproj
index 39e528ef552..97946aac39e 100644
--- a/src/Microsoft.DotNet.SignTool/Microsoft.DotNet.SignTool.csproj
+++ b/src/Microsoft.DotNet.SignTool/Microsoft.DotNet.SignTool.csproj
@@ -1,7 +1,7 @@
- $(NetCurrent);$(NetFrameworkToolCurrent)
+ $(NetToolCurrent);$(NetFrameworkToolCurrent)
true
true
Build artifact signing tool
diff --git a/src/Microsoft.DotNet.SourceBuild/tasks/Microsoft.DotNet.SourceBuild.Tasks.csproj b/src/Microsoft.DotNet.SourceBuild/tasks/Microsoft.DotNet.SourceBuild.Tasks.csproj
index be7a70b0459..78f33c5dd80 100644
--- a/src/Microsoft.DotNet.SourceBuild/tasks/Microsoft.DotNet.SourceBuild.Tasks.csproj
+++ b/src/Microsoft.DotNet.SourceBuild/tasks/Microsoft.DotNet.SourceBuild.Tasks.csproj
@@ -1,7 +1,7 @@
- $(NetCurrent);$(NetFrameworkToolCurrent)
+ $(NetToolCurrent);$(NetFrameworkToolCurrent)
MSBuildSdk
diff --git a/src/Microsoft.DotNet.SourceBuild/tests/Microsoft.DotNet.SourceBuild.Tasks.Tests.csproj b/src/Microsoft.DotNet.SourceBuild/tests/Microsoft.DotNet.SourceBuild.Tasks.Tests.csproj
index 6ebe3507cc1..983f8ca0ec5 100644
--- a/src/Microsoft.DotNet.SourceBuild/tests/Microsoft.DotNet.SourceBuild.Tasks.Tests.csproj
+++ b/src/Microsoft.DotNet.SourceBuild/tests/Microsoft.DotNet.SourceBuild.Tasks.Tests.csproj
@@ -1,7 +1,7 @@
- $(NetCurrent)
+ $(NetToolCurrent)
false
diff --git a/src/Microsoft.DotNet.SwaggerGenerator/Directory.Build.props b/src/Microsoft.DotNet.SwaggerGenerator/Directory.Build.props
new file mode 100644
index 00000000000..917fc19ac15
--- /dev/null
+++ b/src/Microsoft.DotNet.SwaggerGenerator/Directory.Build.props
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+ true
+
+
+
diff --git a/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.CmdLine/Microsoft.DotNet.SwaggerGenerator.CmdLine.csproj b/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.CmdLine/Microsoft.DotNet.SwaggerGenerator.CmdLine.csproj
index 127bd42ab16..1131225c365 100644
--- a/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.CmdLine/Microsoft.DotNet.SwaggerGenerator.CmdLine.csproj
+++ b/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.CmdLine/Microsoft.DotNet.SwaggerGenerator.CmdLine.csproj
@@ -1,13 +1,12 @@
- $(NetCurrent)
+ $(NetToolCurrent)
Exe
true
true
dotnet-swaggergen
false
- true
diff --git a/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.CodeGenerator/Microsoft.DotNet.SwaggerGenerator.CodeGenerator.csproj b/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.CodeGenerator/Microsoft.DotNet.SwaggerGenerator.CodeGenerator.csproj
index 5f9f1b5e297..8a16802c48d 100644
--- a/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.CodeGenerator/Microsoft.DotNet.SwaggerGenerator.CodeGenerator.csproj
+++ b/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.CodeGenerator/Microsoft.DotNet.SwaggerGenerator.CodeGenerator.csproj
@@ -1,9 +1,8 @@
- netstandard2.0
+ $(NetMinimum);netstandard2.0;$(NetFrameworkMinimum)
Microsoft.DotNet.SwaggerGenerator
- true
true
@@ -13,9 +12,16 @@
+
+
+
+
+
+
+
- $(NetCurrent);$(NetFrameworkToolCurrent)
+ $(NetToolCurrent);$(NetFrameworkToolCurrent)
true
This package provides support for generating client library code from a swagger document.
true
- true
-
+
diff --git a/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.MSBuild/build/Microsoft.DotNet.SwaggerGenerator.MSBuild.props b/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.MSBuild/build/Microsoft.DotNet.SwaggerGenerator.MSBuild.props
index 1ae4e21caed..fe91b05f7f5 100644
--- a/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.MSBuild/build/Microsoft.DotNet.SwaggerGenerator.MSBuild.props
+++ b/src/Microsoft.DotNet.SwaggerGenerator/Microsoft.DotNet.SwaggerGenerator.MSBuild/build/Microsoft.DotNet.SwaggerGenerator.MSBuild.props
@@ -1,7 +1,7 @@
-
+
$(MSBuildThisFileDirectory)../tools/net9.0/Microsoft.DotNet.SwaggerGenerator.MSBuild.dll
$(MSBuildThisFileDirectory)../tools/net472/Microsoft.DotNet.SwaggerGenerator.MSBuild.dll
diff --git a/src/Microsoft.DotNet.Tar/Microsoft.DotNet.Tar.csproj b/src/Microsoft.DotNet.Tar/Microsoft.DotNet.Tar.csproj
index 70e78e8855d..13690815698 100644
--- a/src/Microsoft.DotNet.Tar/Microsoft.DotNet.Tar.csproj
+++ b/src/Microsoft.DotNet.Tar/Microsoft.DotNet.Tar.csproj
@@ -1,7 +1,7 @@
- $(NetCurrent);$(NetFrameworkToolCurrent)
+ $(NetToolCurrent);$(NetFrameworkToolCurrent)
Exe
true
true
@@ -10,8 +10,9 @@
false
-
+
true
dotnet-tar
+
diff --git a/src/Microsoft.DotNet.VersionTools.Tasks.Tests/Microsoft.DotNet.VersionTools.Tasks.Tests.csproj b/src/Microsoft.DotNet.VersionTools.Tasks.Tests/Microsoft.DotNet.VersionTools.Tasks.Tests.csproj
index d2313db2c71..bcec91a7b91 100644
--- a/src/Microsoft.DotNet.VersionTools.Tasks.Tests/Microsoft.DotNet.VersionTools.Tasks.Tests.csproj
+++ b/src/Microsoft.DotNet.VersionTools.Tasks.Tests/Microsoft.DotNet.VersionTools.Tasks.Tests.csproj
@@ -1,7 +1,7 @@
- $(NetCurrent)
+ $(NetToolCurrent)
diff --git a/src/Microsoft.DotNet.VersionTools/Directory.Build.props b/src/Microsoft.DotNet.VersionTools/Directory.Build.props
index efc9852000c..779cb202dc3 100644
--- a/src/Microsoft.DotNet.VersionTools/Directory.Build.props
+++ b/src/Microsoft.DotNet.VersionTools/Directory.Build.props
@@ -1,4 +1,3 @@
-
diff --git a/src/Microsoft.DotNet.VersionTools/lib/Microsoft.DotNet.VersionTools.csproj b/src/Microsoft.DotNet.VersionTools/lib/Microsoft.DotNet.VersionTools.csproj
index 1d25b203780..58b29e81199 100644
--- a/src/Microsoft.DotNet.VersionTools/lib/Microsoft.DotNet.VersionTools.csproj
+++ b/src/Microsoft.DotNet.VersionTools/lib/Microsoft.DotNet.VersionTools.csproj
@@ -1,7 +1,7 @@
- netstandard2.0
+ $(NetToolCurrent);netstandard2.0;$(NetFrameworkToolCurrent)
true
@@ -20,4 +20,8 @@
+
+
+
+
diff --git a/src/Microsoft.DotNet.VersionTools/tasks/Microsoft.DotNet.VersionTools.Tasks.csproj b/src/Microsoft.DotNet.VersionTools/tasks/Microsoft.DotNet.VersionTools.Tasks.csproj
index a4e4356db9d..741bb9872aa 100644
--- a/src/Microsoft.DotNet.VersionTools/tasks/Microsoft.DotNet.VersionTools.Tasks.csproj
+++ b/src/Microsoft.DotNet.VersionTools/tasks/Microsoft.DotNet.VersionTools.Tasks.csproj
@@ -1,7 +1,7 @@
- $(NetCurrent);$(NetFrameworkToolCurrent)
+ $(NetToolCurrent);$(NetFrameworkToolCurrent)
true
MSBuildSdk
diff --git a/src/Microsoft.DotNet.VersionTools/tests/Microsoft.DotNet.VersionTools.Tests.csproj b/src/Microsoft.DotNet.VersionTools/tests/Microsoft.DotNet.VersionTools.Tests.csproj
index 405b0ed5e54..380b5fb82ab 100644
--- a/src/Microsoft.DotNet.VersionTools/tests/Microsoft.DotNet.VersionTools.Tests.csproj
+++ b/src/Microsoft.DotNet.VersionTools/tests/Microsoft.DotNet.VersionTools.Tests.csproj
@@ -1,7 +1,7 @@
- $(NetCurrent)
+ $(NetToolCurrent)
diff --git a/src/Microsoft.DotNet.VersionTools/tools/Microsoft.DotNet.VersionTools.Cli.Tests/Microsoft.DotNet.VersionTools.Cli.Tests.csproj b/src/Microsoft.DotNet.VersionTools/tools/Microsoft.DotNet.VersionTools.Cli.Tests/Microsoft.DotNet.VersionTools.Cli.Tests.csproj
index 415f1e35740..9e1065280f5 100644
--- a/src/Microsoft.DotNet.VersionTools/tools/Microsoft.DotNet.VersionTools.Cli.Tests/Microsoft.DotNet.VersionTools.Cli.Tests.csproj
+++ b/src/Microsoft.DotNet.VersionTools/tools/Microsoft.DotNet.VersionTools.Cli.Tests/Microsoft.DotNet.VersionTools.Cli.Tests.csproj
@@ -1,7 +1,7 @@
- $(NetCurrent)
+ $(NetToolCurrent)
diff --git a/src/Microsoft.DotNet.VersionTools/tools/Microsoft.DotNet.VersionTools.Cli/Microsoft.DotNet.VersionTools.Cli.csproj b/src/Microsoft.DotNet.VersionTools/tools/Microsoft.DotNet.VersionTools.Cli/Microsoft.DotNet.VersionTools.Cli.csproj
index 519ec46d5d5..3f28b805f5d 100644
--- a/src/Microsoft.DotNet.VersionTools/tools/Microsoft.DotNet.VersionTools.Cli/Microsoft.DotNet.VersionTools.Cli.csproj
+++ b/src/Microsoft.DotNet.VersionTools/tools/Microsoft.DotNet.VersionTools.Cli/Microsoft.DotNet.VersionTools.Cli.csproj
@@ -1,7 +1,7 @@
- $(NetCurrent)
+ $(NetToolCurrent)
Exe
true
true
diff --git a/src/Microsoft.DotNet.XUnitAssert/src/Microsoft.DotNet.XUnitAssert.csproj b/src/Microsoft.DotNet.XUnitAssert/src/Microsoft.DotNet.XUnitAssert.csproj
index 7e4c0abcc39..6151e92b28c 100644
--- a/src/Microsoft.DotNet.XUnitAssert/src/Microsoft.DotNet.XUnitAssert.csproj
+++ b/src/Microsoft.DotNet.XUnitAssert/src/Microsoft.DotNet.XUnitAssert.csproj
@@ -1,7 +1,7 @@
- $(NetCurrent);$(NetMinimum)
+ $(NetMinimum)
xunit.assert
$(MSBuildProjectName)
enable
diff --git a/src/Microsoft.DotNet.XUnitAssert/tests/Microsoft.DotNet.XUnitAssert.Tests.csproj b/src/Microsoft.DotNet.XUnitAssert/tests/Microsoft.DotNet.XUnitAssert.Tests.csproj
index 44701940131..952d99320ac 100644
--- a/src/Microsoft.DotNet.XUnitAssert/tests/Microsoft.DotNet.XUnitAssert.Tests.csproj
+++ b/src/Microsoft.DotNet.XUnitAssert/tests/Microsoft.DotNet.XUnitAssert.Tests.csproj
@@ -1,7 +1,7 @@
- $(NetCurrent)
+ $(NetToolCurrent)
enable
$(NoWarn);xUnit2000;xUnit2003;xUnit2005;xUnit2007;xUnit2011;xUnit2015;xUnit2017
diff --git a/src/Microsoft.DotNet.XUnitConsoleRunner/src/Microsoft.DotNet.XUnitConsoleRunner.csproj b/src/Microsoft.DotNet.XUnitConsoleRunner/src/Microsoft.DotNet.XUnitConsoleRunner.csproj
index 3c700b101cd..b41d4fbaa20 100644
--- a/src/Microsoft.DotNet.XUnitConsoleRunner/src/Microsoft.DotNet.XUnitConsoleRunner.csproj
+++ b/src/Microsoft.DotNet.XUnitConsoleRunner/src/Microsoft.DotNet.XUnitConsoleRunner.csproj
@@ -1,7 +1,7 @@
- $(NetCurrent)
+ $(NetToolCurrent)
Exe
xunit.console
true
diff --git a/src/Microsoft.DotNet.XUnitExtensions/src/Microsoft.DotNet.XUnitExtensions.csproj b/src/Microsoft.DotNet.XUnitExtensions/src/Microsoft.DotNet.XUnitExtensions.csproj
index 480c59fb5a8..23ee631fb29 100644
--- a/src/Microsoft.DotNet.XUnitExtensions/src/Microsoft.DotNet.XUnitExtensions.csproj
+++ b/src/Microsoft.DotNet.XUnitExtensions/src/Microsoft.DotNet.XUnitExtensions.csproj
@@ -1,7 +1,7 @@
- netstandard2.0;$(NetFrameworkMinimum)
+ $(NetMinimum);netstandard2.0;$(NetFrameworkMinimum)
true
This package provides things like various traits and discovers like OuterLoop/ActiveIssue that are used by .NET test projects.
true
diff --git a/src/Microsoft.DotNet.XUnitExtensions/src/StaticReflectionConstants.cs b/src/Microsoft.DotNet.XUnitExtensions/src/StaticReflectionConstants.cs
index 22eaae60454..3aa5c86780f 100644
--- a/src/Microsoft.DotNet.XUnitExtensions/src/StaticReflectionConstants.cs
+++ b/src/Microsoft.DotNet.XUnitExtensions/src/StaticReflectionConstants.cs
@@ -12,6 +12,7 @@ internal static class StaticReflectionConstants
}
}
+#if !NET
namespace System.Diagnostics.CodeAnalysis
{
// This is a copy of the attribute from CoreLib. The attribute shipped in .NET 5.
@@ -43,3 +44,4 @@ internal enum DynamicallyAccessedMemberTypes
All = ~None
}
}
+#endif
diff --git a/src/Microsoft.DotNet.XUnitExtensions/tests/Microsoft.DotNet.XUnitExtensions.Tests.csproj b/src/Microsoft.DotNet.XUnitExtensions/tests/Microsoft.DotNet.XUnitExtensions.Tests.csproj
index 2d5e3f33614..41d1983b2d6 100644
--- a/src/Microsoft.DotNet.XUnitExtensions/tests/Microsoft.DotNet.XUnitExtensions.Tests.csproj
+++ b/src/Microsoft.DotNet.XUnitExtensions/tests/Microsoft.DotNet.XUnitExtensions.Tests.csproj
@@ -1,7 +1,7 @@
- $(NetCurrent);$(NetFrameworkToolCurrent)
+ $(NetToolCurrent);$(NetFrameworkToolCurrent)
diff --git a/src/Microsoft.DotNet.XliffTasks.Tests/Microsoft.DotNet.XliffTasks.Tests.csproj b/src/Microsoft.DotNet.XliffTasks.Tests/Microsoft.DotNet.XliffTasks.Tests.csproj
index 3e98fd26900..0204cba0f3f 100644
--- a/src/Microsoft.DotNet.XliffTasks.Tests/Microsoft.DotNet.XliffTasks.Tests.csproj
+++ b/src/Microsoft.DotNet.XliffTasks.Tests/Microsoft.DotNet.XliffTasks.Tests.csproj
@@ -1,7 +1,7 @@
- $(NetCurrent)
+ $(NetToolCurrent)
MicrosoftAspNetCore
diff --git a/src/Microsoft.DotNet.XliffTasks/Microsoft.DotNet.XliffTasks.csproj b/src/Microsoft.DotNet.XliffTasks/Microsoft.DotNet.XliffTasks.csproj
index 7d3fa659d6b..d68aaa39d63 100644
--- a/src/Microsoft.DotNet.XliffTasks/Microsoft.DotNet.XliffTasks.csproj
+++ b/src/Microsoft.DotNet.XliffTasks/Microsoft.DotNet.XliffTasks.csproj
@@ -1,7 +1,7 @@
- $(NetCurrent);$(NetFrameworkToolCurrent)
+ $(NetToolCurrent);$(NetFrameworkToolCurrent)
true
XliffTasks
MicrosoftAspNetCore
diff --git a/src/SignCheck/Microsoft.SignCheck/Microsoft.DotNet.SignCheckLibrary.csproj b/src/SignCheck/Microsoft.SignCheck/Microsoft.DotNet.SignCheckLibrary.csproj
index 38525599906..924724dc659 100644
--- a/src/SignCheck/Microsoft.SignCheck/Microsoft.DotNet.SignCheckLibrary.csproj
+++ b/src/SignCheck/Microsoft.SignCheck/Microsoft.DotNet.SignCheckLibrary.csproj
@@ -3,7 +3,7 @@
- $(NetFrameworkToolCurrent)
+ $(NetFrameworkMinimum)
x86
false
Microsoft.SignCheck
diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
new file mode 100644
index 00000000000..2a5dbb84109
--- /dev/null
+++ b/tests/Directory.Build.props
@@ -0,0 +1,9 @@
+
+
+
+
+
+ true
+
+
+
\ No newline at end of file