Skip to content

Commit 85aaca7

Browse files
jkoritzinskyjkoritzinsky
authored
Don't produce an aka.ms link for productVersion.txt for .NET 10 (#15747)
1 parent 24a28c6 commit 85aaca7

File tree

1 file changed

+31
-28
lines changed

1 file changed

+31
-28
lines changed

‎src/Microsoft.DotNet.Build.Tasks.Feed/src/model/PublishingConstants.cs‎

Lines changed: 31 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -339,6 +339,11 @@ public enum BuildQuality
339339
new Regex(@"wixpack", RegexOptions.IgnoreCase),
340340
];
341341

342+
private static readonly ImmutableList<Regex> DotNet10AkaMSDoNotCreateLinkPatterns = [
343+
..DefaultAkaMSDoNotCreateLinkPatterns,
344+
new Regex(@"productversion", RegexOptions.IgnoreCase)
345+
];
346+
342347
#region Target Channel Configs
343348
public static readonly List<TargetChannelConfig> ChannelInfos = new List<TargetChannelConfig>() {
344349

@@ -811,7 +816,7 @@ public enum BuildQuality
811816
publishingInfraVersion: PublishingInfraVersion.Latest,
812817
akaMSChannelNames: ["10.0"],
813818
akaMSCreateLinkPatterns: DefaultAkaMSCreateLinkPatterns,
814-
akaMSDoNotCreateLinkPatterns: DefaultAkaMSDoNotCreateLinkPatterns,
819+
akaMSDoNotCreateLinkPatterns: DotNet10AkaMSDoNotCreateLinkPatterns,
815820
targetFeeds: DotNet10Feeds,
816821
symbolTargetType: SymbolPublishVisibility.Public),
817822

@@ -822,7 +827,7 @@ public enum BuildQuality
822827
publishingInfraVersion: PublishingInfraVersion.Latest,
823828
akaMSChannelNames: [ "10.0-workloads" ],
824829
akaMSCreateLinkPatterns: DefaultAkaMSCreateLinkPatterns,
825-
akaMSDoNotCreateLinkPatterns: DefaultAkaMSDoNotCreateLinkPatterns,
830+
akaMSDoNotCreateLinkPatterns: DotNet10AkaMSDoNotCreateLinkPatterns,
826831
targetFeeds: DotNet10WorkloadFeeds,
827832
symbolTargetType: SymbolPublishVisibility.Public),
828833

@@ -833,7 +838,7 @@ public enum BuildQuality
833838
publishingInfraVersion: PublishingInfraVersion.Latest,
834839
akaMSChannelNames: [ "10.0.1xx", "10.0" ],
835840
akaMSCreateLinkPatterns: DefaultAkaMSCreateLinkPatterns,
836-
akaMSDoNotCreateLinkPatterns: DefaultAkaMSDoNotCreateLinkPatterns,
841+
akaMSDoNotCreateLinkPatterns: DotNet10AkaMSDoNotCreateLinkPatterns,
837842
targetFeeds: DotNet10Feeds,
838843
symbolTargetType: SymbolPublishVisibility.Public),
839844

@@ -844,11 +849,9 @@ public enum BuildQuality
844849
publishingInfraVersion: PublishingInfraVersion.Latest,
845850
akaMSChannelNames: ["10.0.1xx-ub", "10.0-ub"],
846851
akaMSCreateLinkPatterns: DefaultAkaMSCreateLinkPatterns,
847-
akaMSDoNotCreateLinkPatterns: DefaultAkaMSDoNotCreateLinkPatterns,
852+
akaMSDoNotCreateLinkPatterns: DotNet10AkaMSDoNotCreateLinkPatterns,
848853
targetFeeds: DotNet10Feeds,
849-
symbolTargetType: SymbolPublishVisibility.Public,
850-
// Temporarily work around https://github.com/dotnet/source-build/issues/5004
851-
flatten: false),
854+
symbolTargetType: SymbolPublishVisibility.Public),
852855

853856
// .NET 10 Preview 1,
854857
new TargetChannelConfig(
@@ -857,7 +860,7 @@ public enum BuildQuality
857860
publishingInfraVersion: PublishingInfraVersion.Latest,
858861
akaMSChannelNames: ["10.0-preview1"],
859862
akaMSCreateLinkPatterns: DefaultAkaMSCreateLinkPatterns,
860-
akaMSDoNotCreateLinkPatterns: DefaultAkaMSDoNotCreateLinkPatterns,
863+
akaMSDoNotCreateLinkPatterns: DotNet10AkaMSDoNotCreateLinkPatterns,
861864
targetFeeds: DotNet10Feeds,
862865
symbolTargetType: SymbolPublishVisibility.Public),
863866

@@ -868,7 +871,7 @@ public enum BuildQuality
868871
publishingInfraVersion: PublishingInfraVersion.Latest,
869872
akaMSChannelNames: ["10.0-preview2"],
870873
akaMSCreateLinkPatterns: DefaultAkaMSCreateLinkPatterns,
871-
akaMSDoNotCreateLinkPatterns: DefaultAkaMSDoNotCreateLinkPatterns,
874+
akaMSDoNotCreateLinkPatterns: DotNet10AkaMSDoNotCreateLinkPatterns,
872875
targetFeeds: DotNet10Feeds,
873876
symbolTargetType: SymbolPublishVisibility.Public),
874877

@@ -879,7 +882,7 @@ public enum BuildQuality
879882
publishingInfraVersion: PublishingInfraVersion.Latest,
880883
akaMSChannelNames: ["10.0-preview3"],
881884
akaMSCreateLinkPatterns: DefaultAkaMSCreateLinkPatterns,
882-
akaMSDoNotCreateLinkPatterns: DefaultAkaMSDoNotCreateLinkPatterns,
885+
akaMSDoNotCreateLinkPatterns: DotNet10AkaMSDoNotCreateLinkPatterns,
883886
targetFeeds: DotNet10Feeds,
884887
symbolTargetType: SymbolPublishVisibility.Public),
885888

@@ -890,7 +893,7 @@ public enum BuildQuality
890893
publishingInfraVersion: PublishingInfraVersion.Latest,
891894
akaMSChannelNames: ["10.0-preview4"],
892895
akaMSCreateLinkPatterns: DefaultAkaMSCreateLinkPatterns,
893-
akaMSDoNotCreateLinkPatterns: DefaultAkaMSDoNotCreateLinkPatterns,
896+
akaMSDoNotCreateLinkPatterns: DotNet10AkaMSDoNotCreateLinkPatterns,
894897
targetFeeds: DotNet10Feeds,
895898
symbolTargetType: SymbolPublishVisibility.Public),
896899

@@ -901,7 +904,7 @@ public enum BuildQuality
901904
publishingInfraVersion: PublishingInfraVersion.Latest,
902905
akaMSChannelNames: ["10.0-preview5"],
903906
akaMSCreateLinkPatterns: DefaultAkaMSCreateLinkPatterns,
904-
akaMSDoNotCreateLinkPatterns: DefaultAkaMSDoNotCreateLinkPatterns,
907+
akaMSDoNotCreateLinkPatterns: DotNet10AkaMSDoNotCreateLinkPatterns,
905908
targetFeeds: DotNet10Feeds,
906909
symbolTargetType: SymbolPublishVisibility.Public),
907910

@@ -923,7 +926,7 @@ public enum BuildQuality
923926
publishingInfraVersion: PublishingInfraVersion.Latest,
924927
akaMSChannelNames: ["10.0-preview7"],
925928
akaMSCreateLinkPatterns: DefaultAkaMSCreateLinkPatterns,
926-
akaMSDoNotCreateLinkPatterns: DefaultAkaMSDoNotCreateLinkPatterns,
929+
akaMSDoNotCreateLinkPatterns: DotNet10AkaMSDoNotCreateLinkPatterns,
927930
targetFeeds: DotNet10Feeds,
928931
symbolTargetType: SymbolPublishVisibility.Public),
929932

@@ -934,7 +937,7 @@ public enum BuildQuality
934937
publishingInfraVersion: PublishingInfraVersion.Latest,
935938
akaMSChannelNames: ["10.0-rc1"],
936939
akaMSCreateLinkPatterns: DefaultAkaMSCreateLinkPatterns,
937-
akaMSDoNotCreateLinkPatterns: DefaultAkaMSDoNotCreateLinkPatterns,
940+
akaMSDoNotCreateLinkPatterns: DotNet10AkaMSDoNotCreateLinkPatterns,
938941
targetFeeds: DotNet10Feeds,
939942
symbolTargetType: SymbolPublishVisibility.Public),
940943

@@ -945,7 +948,7 @@ public enum BuildQuality
945948
publishingInfraVersion: PublishingInfraVersion.Latest,
946949
akaMSChannelNames: ["internal/10.0-rc1"],
947950
akaMSCreateLinkPatterns: DefaultAkaMSCreateLinkPatterns,
948-
akaMSDoNotCreateLinkPatterns: DefaultAkaMSDoNotCreateLinkPatterns,
951+
akaMSDoNotCreateLinkPatterns: DotNet10AkaMSDoNotCreateLinkPatterns,
949952
targetFeeds: DotNet10InternalFeeds,
950953
symbolTargetType: SymbolPublishVisibility.Internal),
951954

@@ -956,7 +959,7 @@ public enum BuildQuality
956959
publishingInfraVersion: PublishingInfraVersion.Latest,
957960
akaMSChannelNames: ["10.0-rc2"],
958961
akaMSCreateLinkPatterns: DefaultAkaMSCreateLinkPatterns,
959-
akaMSDoNotCreateLinkPatterns: DefaultAkaMSDoNotCreateLinkPatterns,
962+
akaMSDoNotCreateLinkPatterns: DotNet10AkaMSDoNotCreateLinkPatterns,
960963
targetFeeds: DotNet10Feeds,
961964
symbolTargetType: SymbolPublishVisibility.Public),
962965

@@ -967,7 +970,7 @@ public enum BuildQuality
967970
publishingInfraVersion: PublishingInfraVersion.Latest,
968971
akaMSChannelNames: ["internal/10.0-rc2"],
969972
akaMSCreateLinkPatterns: DefaultAkaMSCreateLinkPatterns,
970-
akaMSDoNotCreateLinkPatterns: DefaultAkaMSDoNotCreateLinkPatterns,
973+
akaMSDoNotCreateLinkPatterns: DotNet10AkaMSDoNotCreateLinkPatterns,
971974
targetFeeds: DotNet10InternalFeeds,
972975
symbolTargetType: SymbolPublishVisibility.Internal),
973976

@@ -978,7 +981,7 @@ public enum BuildQuality
978981
publishingInfraVersion: PublishingInfraVersion.Latest,
979982
akaMSChannelNames: ["10.0.1xx-rc1"],
980983
akaMSCreateLinkPatterns: DefaultAkaMSCreateLinkPatterns,
981-
akaMSDoNotCreateLinkPatterns: DefaultAkaMSDoNotCreateLinkPatterns,
984+
akaMSDoNotCreateLinkPatterns: DotNet10AkaMSDoNotCreateLinkPatterns,
982985
targetFeeds: DotNet10Feeds,
983986
symbolTargetType: SymbolPublishVisibility.Public),
984987

@@ -989,7 +992,7 @@ public enum BuildQuality
989992
publishingInfraVersion: PublishingInfraVersion.Latest,
990993
akaMSChannelNames: ["internal/10.0.1xx-rc1"],
991994
akaMSCreateLinkPatterns: DefaultAkaMSCreateLinkPatterns,
992-
akaMSDoNotCreateLinkPatterns: DefaultAkaMSDoNotCreateLinkPatterns,
995+
akaMSDoNotCreateLinkPatterns: DotNet10AkaMSDoNotCreateLinkPatterns,
993996
targetFeeds: DotNet10InternalFeeds,
994997
symbolTargetType: SymbolPublishVisibility.Internal),
995998

@@ -1000,7 +1003,7 @@ public enum BuildQuality
10001003
publishingInfraVersion: PublishingInfraVersion.Latest,
10011004
akaMSChannelNames: ["10.0.1xx-rc2"],
10021005
akaMSCreateLinkPatterns: DefaultAkaMSCreateLinkPatterns,
1003-
akaMSDoNotCreateLinkPatterns: DefaultAkaMSDoNotCreateLinkPatterns,
1006+
akaMSDoNotCreateLinkPatterns: DotNet10AkaMSDoNotCreateLinkPatterns,
10041007
targetFeeds: DotNet10Feeds,
10051008
symbolTargetType: SymbolPublishVisibility.Public),
10061009

@@ -1011,7 +1014,7 @@ public enum BuildQuality
10111014
publishingInfraVersion: PublishingInfraVersion.Latest,
10121015
akaMSChannelNames: ["internal/10.0.1xx-rc2"],
10131016
akaMSCreateLinkPatterns: DefaultAkaMSCreateLinkPatterns,
1014-
akaMSDoNotCreateLinkPatterns: DefaultAkaMSDoNotCreateLinkPatterns,
1017+
akaMSDoNotCreateLinkPatterns: DotNet10AkaMSDoNotCreateLinkPatterns,
10151018
targetFeeds: DotNet10InternalFeeds,
10161019
symbolTargetType: SymbolPublishVisibility.Internal),
10171020

@@ -1022,7 +1025,7 @@ public enum BuildQuality
10221025
publishingInfraVersion: PublishingInfraVersion.Latest,
10231026
akaMSChannelNames: ["10.0.1xx-preview1"],
10241027
akaMSCreateLinkPatterns: DefaultAkaMSCreateLinkPatterns,
1025-
akaMSDoNotCreateLinkPatterns: DefaultAkaMSDoNotCreateLinkPatterns,
1028+
akaMSDoNotCreateLinkPatterns: DotNet10AkaMSDoNotCreateLinkPatterns,
10261029
targetFeeds: DotNet10Feeds,
10271030
symbolTargetType: SymbolPublishVisibility.Public),
10281031

@@ -1033,7 +1036,7 @@ public enum BuildQuality
10331036
publishingInfraVersion: PublishingInfraVersion.Latest,
10341037
akaMSChannelNames: ["10.0.1xx-preview2"],
10351038
akaMSCreateLinkPatterns: DefaultAkaMSCreateLinkPatterns,
1036-
akaMSDoNotCreateLinkPatterns: DefaultAkaMSDoNotCreateLinkPatterns,
1039+
akaMSDoNotCreateLinkPatterns: DotNet10AkaMSDoNotCreateLinkPatterns,
10371040
targetFeeds: DotNet10Feeds,
10381041
symbolTargetType: SymbolPublishVisibility.Public),
10391042

@@ -1044,7 +1047,7 @@ public enum BuildQuality
10441047
publishingInfraVersion: PublishingInfraVersion.Latest,
10451048
akaMSChannelNames: ["10.0.1xx-preview3"],
10461049
akaMSCreateLinkPatterns: DefaultAkaMSCreateLinkPatterns,
1047-
akaMSDoNotCreateLinkPatterns: DefaultAkaMSDoNotCreateLinkPatterns,
1050+
akaMSDoNotCreateLinkPatterns: DotNet10AkaMSDoNotCreateLinkPatterns,
10481051
targetFeeds: DotNet10Feeds,
10491052
symbolTargetType: SymbolPublishVisibility.Public),
10501053

@@ -1055,7 +1058,7 @@ public enum BuildQuality
10551058
publishingInfraVersion: PublishingInfraVersion.Latest,
10561059
akaMSChannelNames: ["10.0.1xx-preview4"],
10571060
akaMSCreateLinkPatterns: DefaultAkaMSCreateLinkPatterns,
1058-
akaMSDoNotCreateLinkPatterns: DefaultAkaMSDoNotCreateLinkPatterns,
1061+
akaMSDoNotCreateLinkPatterns: DotNet10AkaMSDoNotCreateLinkPatterns,
10591062
targetFeeds: DotNet10Feeds,
10601063
symbolTargetType: SymbolPublishVisibility.Public),
10611064

@@ -1066,7 +1069,7 @@ public enum BuildQuality
10661069
publishingInfraVersion: PublishingInfraVersion.Latest,
10671070
akaMSChannelNames: ["10.0.1xx-preview5"],
10681071
akaMSCreateLinkPatterns: DefaultAkaMSCreateLinkPatterns,
1069-
akaMSDoNotCreateLinkPatterns: DefaultAkaMSDoNotCreateLinkPatterns,
1072+
akaMSDoNotCreateLinkPatterns: DotNet10AkaMSDoNotCreateLinkPatterns,
10701073
targetFeeds: DotNet10Feeds,
10711074
symbolTargetType: SymbolPublishVisibility.Public),
10721075

@@ -1077,7 +1080,7 @@ public enum BuildQuality
10771080
publishingInfraVersion: PublishingInfraVersion.Latest,
10781081
akaMSChannelNames: ["10.0.1xx-preview6"],
10791082
akaMSCreateLinkPatterns: DefaultAkaMSCreateLinkPatterns,
1080-
akaMSDoNotCreateLinkPatterns: DefaultAkaMSDoNotCreateLinkPatterns,
1083+
akaMSDoNotCreateLinkPatterns: DotNet10AkaMSDoNotCreateLinkPatterns,
10811084
targetFeeds: DotNet10Feeds,
10821085
symbolTargetType: SymbolPublishVisibility.Public),
10831086

@@ -1088,7 +1091,7 @@ public enum BuildQuality
10881091
publishingInfraVersion: PublishingInfraVersion.Latest,
10891092
akaMSChannelNames: ["10.0.1xx-preview7"],
10901093
akaMSCreateLinkPatterns: DefaultAkaMSCreateLinkPatterns,
1091-
akaMSDoNotCreateLinkPatterns: DefaultAkaMSDoNotCreateLinkPatterns,
1094+
akaMSDoNotCreateLinkPatterns: DotNet10AkaMSDoNotCreateLinkPatterns,
10921095
targetFeeds: DotNet10Feeds,
10931096
symbolTargetType: SymbolPublishVisibility.Public),
10941097

0 commit comments

Comments
 (0)