Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
152 changes: 76 additions & 76 deletions eng/Version.Details.props

Large diffs are not rendered by default.

306 changes: 153 additions & 153 deletions eng/Version.Details.xml

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions eng/common/tools.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -588,6 +588,11 @@ function LocateVisualStudio([object]$vsRequirements = $null){
return $null
}

if ($null -eq $vsInfo -or $vsInfo.Count -eq 0) {
throw "No instance of Visual Studio meeting the requirements specified was found. Requirements: $($args -join ' ')"
return $null
}

# use first matching instance
return $vsInfo[0]
}
Expand Down
12 changes: 6 additions & 6 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
"sdk": {
"version": "11.0.100-preview.1.26078.121",
"version": "11.0.100-preview.1.26104.118",
"allowPrerelease": true,
"rollForward": "major"
},
"tools": {
"dotnet": "11.0.100-preview.1.26078.121"
"dotnet": "11.0.100-preview.1.26104.118"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26110.116",
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26110.116",
"Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.26110.116",
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26118.111",
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26118.111",
"Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.26118.111",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.NET.Sdk.IL": "11.0.0-preview.2.26110.116"
"Microsoft.NET.Sdk.IL": "11.0.0-preview.2.26118.111"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,13 @@
<IgnoreForCI Condition="'$(TargetsMobile)' == 'true' or '$(TargetsLinuxBionic)' == 'true' or '$(TargetArchitecture)' == 'ARMv6'">true</IgnoreForCI>
<!-- SQLitePCLRaw currently has non-portable RIDs (alpine). Update to newer version once it released.
https://github.com/ericsink/SQLitePCL.raw/issues/543 -->
<NoWarn>$(NoWarn);NETSDK1206</NoWarn>
<!-- SYSLIB1002, SYSLIB1013, SYSLIB1018: WithDiagnostics test files intentionally trigger these for testing.
Pragma suppression doesn't work with incremental generators due to trimmed locations (known Roslyn limitation).
Suppress at project level instead. -->
<NoWarn>$(NoWarn);NETSDK1206;SYSLIB1002;SYSLIB1013;SYSLIB1018;8795</NoWarn>
<NoWarn>$(NoWarn);SYSLIB1002;SYSLIB1013;SYSLIB1018</NoWarn>
<!-- CS8795: Partial member must have an implementation part because it has accessibility modifiers -->
<NoWarn>$(NoWarn);8795</NoWarn>
<!-- Treat CS8795 as warning instead of error so NoWarn can suppress it -->
<WarningsNotAsErrors>$(WarningsNotAsErrors);8795</WarningsNotAsErrors>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ namespace Microsoft.Extensions.Logging.Generators.Tests.TestClasses
{
internal static partial class ExceptionTestExtensions
{
#pragma warning disable SYSLIB1013
[LoggerMessage(EventId = 2, Level = LogLevel.Debug, Message = "M2 {arg1}: {ex}")]
internal static partial void M2(ILogger logger, string arg1, Exception ex);
#pragma warning restore SYSLIB1013
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,10 @@ namespace Microsoft.Extensions.Logging.Generators.Tests.TestClasses
{
internal static partial class LevelTestExtensions
{
#pragma warning disable SYSLIB1002
[LoggerMessage(EventId = 12, Message = "M12 {level}")]
internal static partial void M12(ILogger logger, LogLevel level);
#pragma warning restore SYSLIB1002

#pragma warning disable SYSLIB1018
[LoggerMessage(EventId = 13, Message = "M13 {logger}")]
internal static partial void M13(ILogger logger, LogLevel level);
#pragma warning restore SYSLIB1018
}
}
Loading