Skip to content

Commit a6f8e1c

Browse files
authored
Merge branch 'release/8.0.3xx' into merge/release/8.0.1xx-to-release/8.0.3xx
2 parents 0338a18 + efa3f59 commit a6f8e1c

File tree

5 files changed

+117
-103
lines changed

5 files changed

+117
-103
lines changed

Directory.Build.props

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,11 @@
4747
<!-- <TestRunnerAdditionalArguments>-parallel none</TestRunnerAdditionalArguments> -->
4848
</PropertyGroup>
4949

50+
<!-- TODO: Re-enable NuGet Audit and fix alerts: https://github.com/dotnet/sdk/issues/51465 -->
51+
<PropertyGroup>
52+
<NuGetAudit>false</NuGetAudit>
53+
</PropertyGroup>
54+
5055
<PropertyGroup>
5156
<ImplicitUsings>enable</ImplicitUsings>
5257
</PropertyGroup>

NuGet.config

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,27 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-emsdk -->
7+
<add key="darc-pub-dotnet-emsdk-9e37ff5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-9e37ff5e/nuget/v3/index.json" />
78
<!-- End: Package sources from dotnet-emsdk -->
89
<!-- Begin: Package sources from dotnet-format -->
9-
<add key="darc-pub-dotnet-format-c7e5d39" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-c7e5d39b/nuget/v3/index.json" />
10-
<add key="darc-pub-dotnet-format-c7e5d39-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-c7e5d39b-4/nuget/v3/index.json" />
11-
<add key="darc-pub-dotnet-format-c7e5d39-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-c7e5d39b-3/nuget/v3/index.json" />
12-
<add key="darc-pub-dotnet-format-c7e5d39-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-c7e5d39b-2/nuget/v3/index.json" />
13-
<add key="darc-pub-dotnet-format-c7e5d39-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-c7e5d39b-1/nuget/v3/index.json" />
10+
<add key="darc-pub-dotnet-format-9861dd6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-9861dd69/nuget/v3/index.json" />
1411
<!-- End: Package sources from dotnet-format -->
1512
<!-- Begin: Package sources from dotnet-aspnetcore -->
13+
<add key="darc-int-dotnet-aspnetcore-ee41747" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-ee417479/nuget/v3/index.json" />
1614
<!-- End: Package sources from dotnet-aspnetcore -->
1715
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
1816
<add key="darc-pub-DotNet-msbuild-Trusted-1d044e3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-1d044e35/nuget/v3/index.json" />
1917
<!-- End: Package sources from DotNet-msbuild-Trusted -->
2018
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
2119
<!-- End: Package sources from dotnet-roslyn-analyzers -->
2220
<!-- Begin: Package sources from dotnet-runtime -->
21+
<add key="darc-int-dotnet-runtime-a2266c7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-a2266c72/nuget/v3/index.json" />
2322
<!-- End: Package sources from dotnet-runtime -->
2423
<!-- Begin: Package sources from dotnet-templating -->
2524
<add key="darc-pub-dotnet-templating-d3b5c6c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-d3b5c6c0/nuget/v3/index.json" />
2625
<!-- End: Package sources from dotnet-templating -->
2726
<!-- Begin: Package sources from dotnet-windowsdesktop -->
27+
<add key="darc-int-dotnet-windowsdesktop-4519b9f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-4519b9f0/nuget/v3/index.json" />
2828
<!-- End: Package sources from dotnet-windowsdesktop -->
2929
<!-- Begin: Package sources from dotnet-winforms -->
3030
<!-- End: Package sources from dotnet-winforms -->
@@ -51,6 +51,7 @@
5151
<!-- Begin: Package sources from dotnet-templating -->
5252
<!-- End: Package sources from dotnet-templating -->
5353
<!-- Begin: Package sources from dotnet-aspnetcore -->
54+
<add key="darc-int-dotnet-aspnetcore-ee41747" value="true" />
5455
<!-- End: Package sources from dotnet-aspnetcore -->
5556
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
5657
<!-- End: Package sources from DotNet-msbuild-Trusted -->
@@ -60,8 +61,10 @@
6061
<!-- End: Package sources from dotnet-format -->
6162
<!-- End: Package sources from dotnet-aspnetcore -->
6263
<!-- Begin: Package sources from dotnet-runtime -->
64+
<add key="darc-int-dotnet-runtime-a2266c7" value="true" />
6365
<!-- End: Package sources from dotnet-runtime -->
6466
<!-- Begin: Package sources from dotnet-windowsdesktop -->
67+
<add key="darc-int-dotnet-windowsdesktop-4519b9f" value="true" />
6568
<!-- Begin: Package sources from dotnet-winforms -->
6669
<!-- End: Package sources from dotnet-winforms -->
6770
<!-- End: Package sources from dotnet-windowsdesktop -->

0 commit comments

Comments
 (0)