Skip to content

Commit 64108d7

Browse files
joperezrjoperezr
authored
Merging release/9.3 branch into main (#6082)
2 parents a7bbcd8 + cd557a7 commit 64108d7

File tree

26 files changed

+270
-233
lines changed

26 files changed

+270
-233
lines changed

‎NuGet.config

+37-45
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,29 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<packageSources>
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-aspnetcore -->
7-
<add key="darc-int-dotnet-aspnetcore-704f7cb" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1/nuget/v3/index.json" />
8-
<add key="darc-int-dotnet-aspnetcore-704f7cb-9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1-9/nuget/v3/index.json" />
9-
<add key="darc-int-dotnet-aspnetcore-704f7cb-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1-8/nuget/v3/index.json" />
10-
<add key="darc-int-dotnet-aspnetcore-704f7cb-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1-7/nuget/v3/index.json" />
11-
<add key="darc-int-dotnet-aspnetcore-704f7cb-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1-6/nuget/v3/index.json" />
12-
<add key="darc-int-dotnet-aspnetcore-704f7cb-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1-5/nuget/v3/index.json" />
13-
<add key="darc-int-dotnet-aspnetcore-704f7cb-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1-4/nuget/v3/index.json" />
14-
<add key="darc-int-dotnet-aspnetcore-704f7cb-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1-3/nuget/v3/index.json" />
15-
<add key="darc-int-dotnet-aspnetcore-704f7cb-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1-2/nuget/v3/index.json" />
16-
<add key="darc-int-dotnet-aspnetcore-704f7cb-15" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1-15/nuget/v3/index.json" />
17-
<add key="darc-int-dotnet-aspnetcore-704f7cb-14" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1-14/nuget/v3/index.json" />
18-
<add key="darc-int-dotnet-aspnetcore-704f7cb-13" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1-13/nuget/v3/index.json" />
19-
<add key="darc-int-dotnet-aspnetcore-704f7cb-12" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1-12/nuget/v3/index.json" />
20-
<add key="darc-int-dotnet-aspnetcore-704f7cb-11" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1-11/nuget/v3/index.json" />
21-
<add key="darc-int-dotnet-aspnetcore-704f7cb-10" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1-10/nuget/v3/index.json" />
22-
<add key="darc-int-dotnet-aspnetcore-704f7cb-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-704f7cb1-1/nuget/v3/index.json" />
7+
<add key="darc-int-dotnet-aspnetcore-b96167f-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-b96167fb-2/nuget/v3/index.json" />
8+
<add key="darc-int-dotnet-aspnetcore-25ef4aa" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-25ef4aa3/nuget/v3/index.json" />
9+
<add key="darc-int-dotnet-aspnetcore-25ef4aa-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-25ef4aa3-2/nuget/v3/index.json" />
10+
<add key="darc-int-dotnet-aspnetcore-25ef4aa-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-25ef4aa3-1/nuget/v3/index.json" />
2311
<!-- End: Package sources from dotnet-aspnetcore -->
12+
<!-- Begin: Package sources from dotnet-efcore -->
13+
<add key="darc-int-dotnet-efcore-68c7e19" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-68c7e194/nuget/v3/index.json" />
14+
<add key="darc-int-dotnet-efcore-68c7e19-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-68c7e194-2/nuget/v3/index.json" />
15+
<add key="darc-int-dotnet-efcore-68c7e19-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-68c7e194-1/nuget/v3/index.json" />
16+
<add key="darc-int-dotnet-efcore-d009555" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-d0095554/nuget/v3/index.json" />
17+
<add key="darc-int-dotnet-efcore-d009555-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-d0095554-2/nuget/v3/index.json" />
18+
<add key="darc-int-dotnet-efcore-d009555-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-d0095554-1/nuget/v3/index.json" />
19+
<!-- End: Package sources from dotnet-efcore -->
2420
<!-- Begin: Package sources from dotnet-runtime -->
25-
<add key="darc-int-dotnet-runtime-80aa709" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-80aa709f/nuget/v3/index.json" />
26-
<add key="darc-int-dotnet-runtime-80aa709-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-80aa709f-2/nuget/v3/index.json" />
27-
<add key="darc-int-dotnet-runtime-80aa709-15" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-80aa709f-15/nuget/v3/index.json" />
28-
<add key="darc-int-dotnet-runtime-80aa709-14" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-80aa709f-14/nuget/v3/index.json" />
29-
<add key="darc-int-dotnet-runtime-80aa709-12" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-80aa709f-12/nuget/v3/index.json" />
30-
<add key="darc-int-dotnet-runtime-80aa709-10" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-80aa709f-10/nuget/v3/index.json" />
21+
<add key="darc-int-dotnet-runtime-831d23e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-831d23e5/nuget/v3/index.json" />
22+
<add key="darc-int-dotnet-runtime-831d23e-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-831d23e5-2/nuget/v3/index.json" />
23+
<add key="darc-int-dotnet-runtime-831d23e-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-831d23e5-1/nuget/v3/index.json" />
24+
<add key="darc-int-dotnet-runtime-1584e49" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-1584e493/nuget/v3/index.json" />
25+
<add key="darc-int-dotnet-runtime-1584e49-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-1584e493-2/nuget/v3/index.json" />
26+
<add key="darc-int-dotnet-runtime-1584e49-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-1584e493-1/nuget/v3/index.json" />
3127
<!-- End: Package sources from dotnet-runtime -->
3228
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3329
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
@@ -63,30 +59,26 @@
6359
<disabledPackageSources>
6460
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
6561
<!-- Begin: Package sources from dotnet-aspnetcore -->
66-
<add key="darc-int-dotnet-aspnetcore-704f7cb-1" value="true" />
67-
<add key="darc-int-dotnet-aspnetcore-704f7cb-10" value="true" />
68-
<add key="darc-int-dotnet-aspnetcore-704f7cb-11" value="true" />
69-
<add key="darc-int-dotnet-aspnetcore-704f7cb-12" value="true" />
70-
<add key="darc-int-dotnet-aspnetcore-704f7cb-13" value="true" />
71-
<add key="darc-int-dotnet-aspnetcore-704f7cb-14" value="true" />
72-
<add key="darc-int-dotnet-aspnetcore-704f7cb-15" value="true" />
73-
<add key="darc-int-dotnet-aspnetcore-704f7cb-2" value="true" />
74-
<add key="darc-int-dotnet-aspnetcore-704f7cb-3" value="true" />
75-
<add key="darc-int-dotnet-aspnetcore-704f7cb-4" value="true" />
76-
<add key="darc-int-dotnet-aspnetcore-704f7cb-5" value="true" />
77-
<add key="darc-int-dotnet-aspnetcore-704f7cb-6" value="true" />
78-
<add key="darc-int-dotnet-aspnetcore-704f7cb-7" value="true" />
79-
<add key="darc-int-dotnet-aspnetcore-704f7cb-8" value="true" />
80-
<add key="darc-int-dotnet-aspnetcore-704f7cb-9" value="true" />
81-
<add key="darc-int-dotnet-aspnetcore-704f7cb" value="true" />
62+
<add key="darc-int-dotnet-aspnetcore-b96167f-2" value="true" />
63+
<add key="darc-int-dotnet-aspnetcore-25ef4aa-1" value="true" />
64+
<add key="darc-int-dotnet-aspnetcore-25ef4aa-2" value="true" />
65+
<add key="darc-int-dotnet-aspnetcore-25ef4aa" value="true" />
66+
<!-- Begin: Package sources from dotnet-efcore -->
67+
<add key="darc-int-dotnet-efcore-68c7e19-1" value="true" />
68+
<add key="darc-int-dotnet-efcore-68c7e19-2" value="true" />
69+
<add key="darc-int-dotnet-efcore-68c7e19" value="true" />
70+
<add key="darc-int-dotnet-efcore-d009555-1" value="true" />
71+
<add key="darc-int-dotnet-efcore-d009555-2" value="true" />
72+
<add key="darc-int-dotnet-efcore-d009555" value="true" />
73+
<!-- End: Package sources from dotnet-efcore -->
8274
<!-- End: Package sources from dotnet-aspnetcore -->
8375
<!-- Begin: Package sources from dotnet-runtime -->
84-
<add key="darc-int-dotnet-runtime-80aa709-10" value="true" />
85-
<add key="darc-int-dotnet-runtime-80aa709-12" value="true" />
86-
<add key="darc-int-dotnet-runtime-80aa709-14" value="true" />
87-
<add key="darc-int-dotnet-runtime-80aa709-15" value="true" />
88-
<add key="darc-int-dotnet-runtime-80aa709-2" value="true" />
89-
<add key="darc-int-dotnet-runtime-80aa709" value="true" />
76+
<add key="darc-int-dotnet-runtime-831d23e-1" value="true" />
77+
<add key="darc-int-dotnet-runtime-831d23e-2" value="true" />
78+
<add key="darc-int-dotnet-runtime-831d23e" value="true" />
79+
<add key="darc-int-dotnet-runtime-1584e49-1" value="true" />
80+
<add key="darc-int-dotnet-runtime-1584e49-2" value="true" />
81+
<add key="darc-int-dotnet-runtime-1584e49" value="true" />
9082
<!-- End: Package sources from dotnet-runtime -->
9183
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
9284
</disabledPackageSources>

‎eng/MSBuild/ProjectStaging.targets

+5-19
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,6 @@
44
<!-- Preview packages: do not use stable branding and do not warn about lack of [Experimental] -->
55
<SuppressFinalPackageVersion Condition="'$(Stage)' == 'preview'">true</SuppressFinalPackageVersion>
66
<NoWarn Condition="'$(Stage)' == 'preview'">$(NoWarn);LA0003</NoWarn>
7-
8-
<!-- Amend the description based on stage -->
9-
<Description Condition="'$(Stage)' == 'dev'">Experimental package. $(Description)</Description>
10-
<Description Condition="'$(Stage)' == 'obsolete'">Obsolete Package. $(Description)</Description>
11-
</PropertyGroup>
12-
13-
<PropertyGroup>
14-
<!--
15-
Makes it such that the package version won't be stabilized even when the rest of the repo is going stable.
16-
https://github.com/dotnet/arcade/blob/main/Documentation/CorePackages/Versioning.md#package-version
17-
-->
18-
<SuppressFinalPackageVersion />
19-
<SuppressFinalPackageVersion Condition="'$(Stage)' == 'dev' or '$(Stage)' == 'preview'">true</SuppressFinalPackageVersion>
207
</PropertyGroup>
218

229
<!-- Produce errors if we don't have all the right properties defined -->
@@ -35,11 +22,10 @@
3522
<Error Condition="'$(MinMutationScore)' != 'n/a' AND ('$(MinMutationScore)' &lt; 50)" Text="MinMutationScore property must be >= 50 for normal stage." />
3623
</Target>
3724

38-
<Target Name="_ValidateVersion" AfterTargets="GenerateNuspec" Condition="'$(Stage)' == 'dev' or '$(Stage)' == 'preview'">
39-
<PropertyGroup>
40-
<_ExpectedVersionSuffix>$(_PreReleaseLabel)$(_BuildNumberLabels)</_ExpectedVersionSuffix>
41-
</PropertyGroup>
25+
<!-- Amend the description based on stage -->
26+
<PropertyGroup>
27+
<Description Condition="'$(Stage)' == 'dev'">Experimental package. $(Description)</Description>
28+
<Description Condition="'$(Stage)' == 'obsolete'">Obsolete Package. $(Description)</Description>
29+
</PropertyGroup>
4230

43-
<Error Condition=" '$(VersionSuffix)' != '$(_ExpectedVersionSuffix)' " Text="Unexpected package version suffix. Expected suffix for '$(Stage)' stage: '$(_ExpectedVersionSuffix)', received: '$(VersionSuffix)'." />
44-
</Target>
4531
</Project>

0 commit comments

Comments
 (0)