Skip to content

Revert "Use .NET 6 GA SDK (#1097)" #1101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 2, 2021
Merged

Revert "Use .NET 6 GA SDK (#1097)" #1101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
<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" />
<!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<!-- Temporary until .NET 6 GA to get Microsoft.WindowsDesktop.App.Runtime.* packages -->
<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" />
<!-- Feeds used in Maestro/Arcade publishing -->
<add key="dotnet5" value="https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet5/nuget/v3/index.json" />
<add key="dotnet6" value="https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet6/nuget/v3/index.json" />
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "6.0.100",
"dotnet": "6.0.100-rc.2.21505.57",
"runtimes": {
"aspnetcore": [
"$(MicrosoftAspNetCoreApp31Version)",
Expand Down
14 changes: 11 additions & 3 deletions src/Tools/dotnet-monitor/dotnet-monitor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,17 @@
<!-- This forces the creation of a checksum file and uploads it to blob storage
using this name as part of the blob relative path. -->
<BlobGroupPrefix>monitor</BlobGroupPrefix>
<!-- Temporarily pin netcoreapp3.1 runtime framework version until .NET 6 GA.
This will allow the tool to be built without the unreleased minimum runtime framework versions. -->
<RuntimeFrameworkVersion Condition="'$(TargetFramework)' == 'netcoreapp3.1'">3.1.0</RuntimeFrameworkVersion>
<!-- File locking warnings (that are typically resolved with automatic retries) are failing builds
quite frequently with messages such as:

error MSB3026: (NETCORE_ENGINEERING_TELEMETRY=Build) Could not copy "...\dotnet-monitor.dll" to
"...\dotnet-monitor.dll". Beginning retry 1 in 1000ms. The process cannot access the file
'...\dotnet-monitor.dll' because it is being used by another process.

work around this problem by telling the compiler to not warn about the issue. A file lock that
actually prevents the build from completing correctly should still fail the compilation with
an MSB3027 error. -->
<NoWarn>$(NoWarn);MSB3026</NoWarn>
</PropertyGroup>

<ItemGroup>
Expand Down