Skip to content

Commit a87fce4

Browse files
committed
Remove package source mapping
1 parent 061d0fe commit a87fce4

File tree

2 files changed

+14
-33
lines changed

2 files changed

+14
-33
lines changed

NuGet.config

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,4 @@
88
<add key="AzureFunctionsRelease" value="https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/AzureFunctionsRelease/nuget/v3/index.json" />
99
<add key="AzureFunctionsTempStaging" value="https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/AzureFunctionsTempStaging/nuget/v3/index.json" />
1010
</packageSources>
11-
<packageSourceMapping>
12-
<packageSource key="nuget.org">
13-
<package pattern="*" />
14-
</packageSource>
15-
<packageSource key="AzureFunctions@internalrelease">
16-
<package pattern="Microsoft.Azure.AppService.*" />
17-
</packageSource>
18-
<packageSource key="Microsoft.Azure.Functions.PowerShellWorker">
19-
<package pattern="Microsoft.Azure.Functions.PowerShellWorker.*" />
20-
</packageSource>
21-
<packageSource key="AzureFunctionsRelease">
22-
<package pattern="Microsoft.Azure.Functions.DotNetIsolatedNativeHost" />
23-
<package pattern="Microsoft.Azure.Functions.JavaWorker" />
24-
<package pattern="Microsoft.Azure.Functions.NodeJSWorker" />
25-
<package pattern="Microsoft.Azure.Functions.PythonWorker" />
26-
</packageSource>
27-
<packageSource key="AzureFunctionsTempStaging">
28-
<package pattern="Microsoft.Azure.WebJobs.*" />
29-
</packageSource>
30-
</packageSourceMapping>
3111
</configuration>

eng/build/Engineering.props

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,12 @@
55
<WorkersProps>$(EngBuildRoot)Workers.props</WorkersProps>
66
</PropertyGroup>
77

8-
<PropertyGroup>
9-
<!-- Nuget audit as warnings only, even in TreatWarningsAsErrors. -->
10-
<!-- Except for in CI, critical will fail the build. -->
11-
<WarningsNotAsErrors>$(WarningsNotAsErrors)NU1901;NU1902;NU1903;</WarningsNotAsErrors>
12-
<WarningsNotAsErrors Condition="'$(CI)' == 'false'">$(WarningsNotAsErrors)NU1904;</WarningsNotAsErrors>
13-
<WarningsAsErrors Condition="'$(CI)' == 'true'">$(WarningsAsErrors)NU1904;</WarningsAsErrors>
14-
<NuGetAuditLevel>moderate</NuGetAuditLevel> <!-- warn on moderate severity only. -->
15-
<NuGetAuditMode>all</NuGetAuditMode> <!-- audit transitive dependencies. -->
16-
</PropertyGroup>
17-
188
<PropertyGroup>
199
<LangVersion>latest</LangVersion>
2010
<AssemblyOriginatorKeyFile>$(EngResourceRoot)key.snk</AssemblyOriginatorKeyFile>
2111
<CodeAnalysisRuleSet>$(RepoRoot)src.ruleset</CodeAnalysisRuleSet>
22-
<NoWarn>$(NoWarn);NU1701;NU5104</NoWarn>
12+
<!-- TODO: add package source mapping and remove NU1507 suppression -->
13+
<NoWarn>$(NoWarn);NU1701;NU5104;NU1507</NoWarn>
2314
<DebugType>embedded</DebugType>
2415
<GenerateRuntimeConfigDevFile>true</GenerateRuntimeConfigDevFile><!-- https://github.com/dotnet/runtime/issues/54684 -->
2516
<DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
@@ -30,12 +21,22 @@
3021
<AdditionalFiles Include="$(RepoRoot)stylecop.json" Link="stylecop.json" />
3122
</ItemGroup>
3223

33-
<Import Project="$(MSBuildThisFileDirectory)Release.props" />
34-
3524
<!-- To use PlaceholderSimulation:
3625
1. Set env variable PlaceholderSimulation=true
3726
2. OR build with -p:PlaceholderSimulation=true
3827
-->
3928
<Import Project="$(MSBuildThisFileDirectory)PlaceholderSimulation.props" Condition="'$(PlaceholderSimulation)' == 'true'"/>
29+
<Import Project="$(MSBuildThisFileDirectory)Release.props" />
30+
31+
<!-- Run after Release.props, which sets the CI values-->
32+
<PropertyGroup>
33+
<!-- Nuget audit as warnings only, even in TreatWarningsAsErrors. -->
34+
<!-- Except for in CI, critical will fail the build. -->
35+
<WarningsNotAsErrors>$(WarningsNotAsErrors)NU1901;NU1902;NU1903;</WarningsNotAsErrors>
36+
<WarningsNotAsErrors Condition="'$(CI)' == 'false'">$(WarningsNotAsErrors)NU1904;</WarningsNotAsErrors>
37+
<WarningsAsErrors Condition="'$(CI)' == 'true'">$(WarningsAsErrors)NU1904;</WarningsAsErrors>
38+
<NuGetAuditLevel>moderate</NuGetAuditLevel> <!-- warn on moderate severity only. -->
39+
<NuGetAuditMode>all</NuGetAuditMode> <!-- audit transitive dependencies. -->
40+
</PropertyGroup>
4041

4142
</Project>

0 commit comments

Comments
 (0)