diff --git a/eng/Versions.props b/eng/Versions.props index e9ea797f85704c..6a8779a6ff8e4c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,7 +143,6 @@ 8.0.0 4.5.5 8.0.5 - 8.0.0 8.0.0 8.0.0 8.0.0 diff --git a/src/installer/managed/Microsoft.NET.HostModel/ComHost/ConflictingGuidException.cs b/src/installer/managed/Microsoft.NET.HostModel/ComHost/ConflictingGuidException.cs index 9174ec02e18eea..66eec68031021a 100644 --- a/src/installer/managed/Microsoft.NET.HostModel/ComHost/ConflictingGuidException.cs +++ b/src/installer/managed/Microsoft.NET.HostModel/ComHost/ConflictingGuidException.cs @@ -14,6 +14,10 @@ public class ConflictingGuidException : Exception { public ConflictingGuidException(string typeName1, string typeName2, Guid guid) { +#if NET + ArgumentNullException.ThrowIfNull(typeName1); + ArgumentNullException.ThrowIfNull(typeName2); +#else if (typeName1 is null) { throw new ArgumentNullException(nameof(typeName1)); @@ -22,6 +26,7 @@ public ConflictingGuidException(string typeName1, string typeName2, Guid guid) { throw new ArgumentNullException(nameof(typeName2)); } +#endif TypeName1 = typeName1; TypeName2 = typeName2; Guid = guid; diff --git a/src/installer/managed/Microsoft.NET.HostModel/ComHost/MissingGuidException.cs b/src/installer/managed/Microsoft.NET.HostModel/ComHost/MissingGuidException.cs index 4d2ee58797bdd1..890d7d6d68f3d9 100644 --- a/src/installer/managed/Microsoft.NET.HostModel/ComHost/MissingGuidException.cs +++ b/src/installer/managed/Microsoft.NET.HostModel/ComHost/MissingGuidException.cs @@ -14,10 +14,14 @@ public class MissingGuidException : Exception { public MissingGuidException(string typeName) { +#if NET + ArgumentNullException.ThrowIfNull(typeName); +#else if (typeName is null) { throw new ArgumentNullException(nameof(typeName)); } +#endif TypeName = typeName; } diff --git a/src/installer/managed/Microsoft.NET.HostModel/Microsoft.NET.HostModel.csproj b/src/installer/managed/Microsoft.NET.HostModel/Microsoft.NET.HostModel.csproj index 7c1b015930d56e..71d7ae8213b62e 100644 --- a/src/installer/managed/Microsoft.NET.HostModel/Microsoft.NET.HostModel.csproj +++ b/src/installer/managed/Microsoft.NET.HostModel/Microsoft.NET.HostModel.csproj @@ -1,7 +1,7 @@ - netstandard2.0 + $(NetCoreAppToolCurrent);$(NetFrameworkToolCurrent) Abstractions for modifying .NET host binaries false true @@ -14,16 +14,16 @@ true MicrosoftAspNetCore - true + true $(DefineConstants);HOST_MODEL - - - - - - + + + + + + @@ -35,4 +35,6 @@ + +