Skip to content

Commit 3a49a74

Browse files
authored
Revert "Use .NET 6 GA SDK (#1097)" (#1101)
This reverts commit f5832e0.
1 parent f5832e0 commit 3a49a74

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

NuGet.config

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
<add key="darc-pub-dotnet-runtime-4822e3c-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-4822e3c3-1/nuget/v3/index.json" />
1616
<!-- End: Package sources from dotnet-runtime -->
1717
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
18-
<!-- Temporary until .NET 6 GA to get Microsoft.WindowsDesktop.App.Runtime.* packages -->
19-
<add key="darc-pub-dotnet-windowsdesktop-f22ff8b3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-windowsdesktop-f22ff8b3/nuget/v3/index.json" />
2018
<!-- Feeds used in Maestro/Arcade publishing -->
2119
<add key="dotnet5" value="https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet5/nuget/v3/index.json" />
2220
<add key="dotnet6" value="https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet6/nuget/v3/index.json" />

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "6.0.100",
3+
"dotnet": "6.0.100-rc.2.21505.57",
44
"runtimes": {
55
"aspnetcore": [
66
"$(MicrosoftAspNetCoreApp31Version)",

src/Tools/dotnet-monitor/dotnet-monitor.csproj

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,17 @@
1313
<!-- This forces the creation of a checksum file and uploads it to blob storage
1414
using this name as part of the blob relative path. -->
1515
<BlobGroupPrefix>monitor</BlobGroupPrefix>
16-
<!-- Temporarily pin netcoreapp3.1 runtime framework version until .NET 6 GA.
17-
This will allow the tool to be built without the unreleased minimum runtime framework versions. -->
18-
<RuntimeFrameworkVersion Condition="'$(TargetFramework)' == 'netcoreapp3.1'">3.1.0</RuntimeFrameworkVersion>
16+
<!-- File locking warnings (that are typically resolved with automatic retries) are failing builds
17+
quite frequently with messages such as:
18+
19+
error MSB3026: (NETCORE_ENGINEERING_TELEMETRY=Build) Could not copy "...\dotnet-monitor.dll" to
20+
"...\dotnet-monitor.dll". Beginning retry 1 in 1000ms. The process cannot access the file
21+
'...\dotnet-monitor.dll' because it is being used by another process.
22+
23+
work around this problem by telling the compiler to not warn about the issue. A file lock that
24+
actually prevents the build from completing correctly should still fail the compilation with
25+
an MSB3027 error. -->
26+
<NoWarn>$(NoWarn);MSB3026</NoWarn>
1927
</PropertyGroup>
2028

2129
<ItemGroup>

0 commit comments

Comments
 (0)