Skip to content

Commit 1b84747

Browse files
ViktorHoferViktorHofer
authored
Add Microsoft.CodeAnalysis/4.9 dependencies (#870)
* Add Microsoft.CodeAnalysis/4.10 dependencies ... necessary to consume new Roslyn dependencies. Roslyn recently updated to 8.0.0 dependencies which makes this change necessary. Unblocks dotnet/runtime#97152 * Undo incorrect GenAPI changes * Fix order in Build.props
1 parent a392d3e commit 1b84747

File tree

72 files changed

+4680
-92
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+4680
-92
lines changed

‎eng/Build.props‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,16 @@
2626
<DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\Microsoft.CodeAnalysis.CSharp.4.6.0.csproj" />
2727

2828
<DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\System.Reflection.MetadataLoadContext.8.0.0.csproj" />
29+
30+
<DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\System.Composition.Runtime.8.0.0.csproj" />
31+
<DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\System.Composition.Hosting.8.0.0.csproj" />
32+
<DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\System.Composition.AttributedModel.8.0.0.csproj" />
33+
<DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\System.Composition.Convention.8.0.0.csproj" />
34+
<DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\System.Composition.TypedParts.8.0.0.csproj" />
35+
<DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\System.Composition.8.0.0.csproj" />
36+
<DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\System.IO.Pipelines.8.0.0.csproj" />
37+
<DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\System.Text.Encoding.CodePages.8.0.0.csproj" />
38+
<DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\System.Threading.Channels.8.0.0.csproj" />
2939
</ItemGroup>
3040

3141
<ItemGroup Condition="'$(BuildDependencyPackageProjects)' == 'true'">

‎src/referencePackages/Directory.Build.targets‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,16 +112,15 @@
112112
AfterTargets="CopyFilesToOutputDirectory">
113113

114114
<ItemGroup>
115-
<CompileForRelativePath Include="@(Compile)" />
116-
<CompileForRelativePath Remove="$(RepoRoot)src\SourceBuildAssemblyMetdata.cs" />
115+
<CompileWithRelativePath Include="@(Compile)" Condition="!$([System.String]::new('%(Identity)').StartsWith('/'))" />
117116
</ItemGroup>
118117

119118
<Error
120-
Condition="@(CompileForRelativePath->Count()) != 1"
119+
Condition="@(CompileWithRelativePath->Count()) != 1"
121120
Text="Number of Compile items != 1. We need just one, to determine the path of the resulting DLL in the package including ref/lib and TFM." />
122121

123122
<ItemGroup>
124-
<FullCompileDir Include="$([System.IO.Directory]::GetParent('%(CompileForRelativePath.Identity)'))" />
123+
<FullCompileDir Include="$([System.IO.Directory]::GetParent('%(CompileWithRelativePath.Identity)'))" />
125124
<RelativeCompileDir Include="$([MSBuild]::MakeRelative('$(MSBuildProjectDirectory)\', '%(FullCompileDir.Identity)'))" />
126125
</ItemGroup>
127126

‎src/referencePackages/src/system.collections/4.3.0/ref/netstandard1.0/System.Collections.cs‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public Dictionary(int capacity) { }
104104

105105
public TValue this[TKey key] { get { throw null; } set { } }
106106

107-
public Dictionary<TKey, TValue>.KeyCollection Keys { get { throw null; } }
107+
public KeyCollection Keys { get { throw null; } }
108108

109109
bool ICollection<KeyValuePair<TKey, TValue>>.IsReadOnly { get { throw null; } }
110110

@@ -130,7 +130,7 @@ public Dictionary(int capacity) { }
130130

131131
ICollection IDictionary.Values { get { throw null; } }
132132

133-
public Dictionary<TKey, TValue>.ValueCollection Values { get { throw null; } }
133+
public ValueCollection Values { get { throw null; } }
134134

135135
public void Add(TKey key, TValue value) { }
136136

@@ -140,7 +140,7 @@ public void Clear() { }
140140

141141
public bool ContainsValue(TValue value) { throw null; }
142142

143-
public Dictionary<TKey, TValue>.Enumerator GetEnumerator() { throw null; }
143+
public Enumerator GetEnumerator() { throw null; }
144144

145145
public bool Remove(TKey key) { throw null; }
146146

@@ -201,7 +201,7 @@ public KeyCollection(Dictionary<TKey, TValue> dictionary) { }
201201

202202
public void CopyTo(TKey[] array, int index) { }
203203

204-
public Dictionary<TKey, TValue>.KeyCollection.Enumerator GetEnumerator() { throw null; }
204+
public Enumerator GetEnumerator() { throw null; }
205205

206206
void ICollection<TKey>.Add(TKey item) { }
207207

@@ -245,7 +245,7 @@ public ValueCollection(Dictionary<TKey, TValue> dictionary) { }
245245

246246
public void CopyTo(TValue[] array, int index) { }
247247

248-
public Dictionary<TKey, TValue>.ValueCollection.Enumerator GetEnumerator() { throw null; }
248+
public Enumerator GetEnumerator() { throw null; }
249249

250250
void ICollection<TValue>.Add(TValue item) { }
251251

@@ -317,7 +317,7 @@ public void CopyTo(T[] array) { }
317317

318318
public void ExceptWith(IEnumerable<T> other) { }
319319

320-
public HashSet<T>.Enumerator GetEnumerator() { throw null; }
320+
public Enumerator GetEnumerator() { throw null; }
321321

322322
public void IntersectWith(IEnumerable<T> other) { }
323323

@@ -420,7 +420,7 @@ public void CopyTo(T[] array, int index) { }
420420

421421
public LinkedListNode<T> FindLast(T value) { throw null; }
422422

423-
public LinkedList<T>.Enumerator GetEnumerator() { throw null; }
423+
public Enumerator GetEnumerator() { throw null; }
424424

425425
public bool Remove(T value) { throw null; }
426426

@@ -518,7 +518,7 @@ public void CopyTo(int index, T[] array, int arrayIndex, int count) { }
518518

519519
public int FindLastIndex(Predicate<T> match) { throw null; }
520520

521-
public List<T>.Enumerator GetEnumerator() { throw null; }
521+
public Enumerator GetEnumerator() { throw null; }
522522

523523
public List<T> GetRange(int index, int count) { throw null; }
524524

@@ -618,7 +618,7 @@ public void CopyTo(T[] array, int arrayIndex) { }
618618

619619
public void Enqueue(T item) { }
620620

621-
public Queue<T>.Enumerator GetEnumerator() { throw null; }
621+
public Enumerator GetEnumerator() { throw null; }
622622

623623
public T Peek() { throw null; }
624624

@@ -662,7 +662,7 @@ public SortedDictionary(IDictionary<TKey, TValue> dictionary) { }
662662

663663
public TValue this[TKey key] { get { throw null; } set { } }
664664

665-
public SortedDictionary<TKey, TValue>.KeyCollection Keys { get { throw null; } }
665+
public KeyCollection Keys { get { throw null; } }
666666

667667
bool ICollection<KeyValuePair<TKey, TValue>>.IsReadOnly { get { throw null; } }
668668

@@ -684,7 +684,7 @@ public SortedDictionary(IDictionary<TKey, TValue> dictionary) { }
684684

685685
ICollection IDictionary.Values { get { throw null; } }
686686

687-
public SortedDictionary<TKey, TValue>.ValueCollection Values { get { throw null; } }
687+
public ValueCollection Values { get { throw null; } }
688688

689689
public void Add(TKey key, TValue value) { }
690690

@@ -696,7 +696,7 @@ public void Clear() { }
696696

697697
public void CopyTo(KeyValuePair<TKey, TValue>[] array, int index) { }
698698

699-
public SortedDictionary<TKey, TValue>.Enumerator GetEnumerator() { throw null; }
699+
public Enumerator GetEnumerator() { throw null; }
700700

701701
public bool Remove(TKey key) { throw null; }
702702

@@ -755,7 +755,7 @@ public KeyCollection(SortedDictionary<TKey, TValue> dictionary) { }
755755

756756
public void CopyTo(TKey[] array, int index) { }
757757

758-
public SortedDictionary<TKey, TValue>.KeyCollection.Enumerator GetEnumerator() { throw null; }
758+
public Enumerator GetEnumerator() { throw null; }
759759

760760
void ICollection<TKey>.Add(TKey item) { }
761761

@@ -799,7 +799,7 @@ public ValueCollection(SortedDictionary<TKey, TValue> dictionary) { }
799799

800800
public void CopyTo(TValue[] array, int index) { }
801801

802-
public SortedDictionary<TKey, TValue>.ValueCollection.Enumerator GetEnumerator() { throw null; }
802+
public Enumerator GetEnumerator() { throw null; }
803803

804804
void ICollection<TValue>.Add(TValue item) { }
805805

@@ -868,7 +868,7 @@ public void CopyTo(T[] array) { }
868868

869869
public void ExceptWith(IEnumerable<T> other) { }
870870

871-
public SortedSet<T>.Enumerator GetEnumerator() { throw null; }
871+
public Enumerator GetEnumerator() { throw null; }
872872

873873
public virtual SortedSet<T> GetViewBetween(T lowerValue, T upperValue) { throw null; }
874874

@@ -938,7 +938,7 @@ public void Clear() { }
938938

939939
public void CopyTo(T[] array, int arrayIndex) { }
940940

941-
public Stack<T>.Enumerator GetEnumerator() { throw null; }
941+
public Enumerator GetEnumerator() { throw null; }
942942

943943
public T Peek() { throw null; }
944944

‎src/referencePackages/src/system.collections/4.3.0/ref/netstandard1.3/System.Collections.cs‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public Dictionary(int capacity) { }
107107

108108
public TValue this[TKey key] { get { throw null; } set { } }
109109

110-
public Dictionary<TKey, TValue>.KeyCollection Keys { get { throw null; } }
110+
public KeyCollection Keys { get { throw null; } }
111111

112112
bool ICollection<KeyValuePair<TKey, TValue>>.IsReadOnly { get { throw null; } }
113113

@@ -133,7 +133,7 @@ public Dictionary(int capacity) { }
133133

134134
ICollection IDictionary.Values { get { throw null; } }
135135

136-
public Dictionary<TKey, TValue>.ValueCollection Values { get { throw null; } }
136+
public ValueCollection Values { get { throw null; } }
137137

138138
public void Add(TKey key, TValue value) { }
139139

@@ -143,7 +143,7 @@ public void Clear() { }
143143

144144
public bool ContainsValue(TValue value) { throw null; }
145145

146-
public Dictionary<TKey, TValue>.Enumerator GetEnumerator() { throw null; }
146+
public Enumerator GetEnumerator() { throw null; }
147147

148148
public bool Remove(TKey key) { throw null; }
149149

@@ -204,7 +204,7 @@ public KeyCollection(Dictionary<TKey, TValue> dictionary) { }
204204

205205
public void CopyTo(TKey[] array, int index) { }
206206

207-
public Dictionary<TKey, TValue>.KeyCollection.Enumerator GetEnumerator() { throw null; }
207+
public Enumerator GetEnumerator() { throw null; }
208208

209209
void ICollection<TKey>.Add(TKey item) { }
210210

@@ -248,7 +248,7 @@ public ValueCollection(Dictionary<TKey, TValue> dictionary) { }
248248

249249
public void CopyTo(TValue[] array, int index) { }
250250

251-
public Dictionary<TKey, TValue>.ValueCollection.Enumerator GetEnumerator() { throw null; }
251+
public Enumerator GetEnumerator() { throw null; }
252252

253253
void ICollection<TValue>.Add(TValue item) { }
254254

@@ -320,7 +320,7 @@ public void CopyTo(T[] array) { }
320320

321321
public void ExceptWith(IEnumerable<T> other) { }
322322

323-
public HashSet<T>.Enumerator GetEnumerator() { throw null; }
323+
public Enumerator GetEnumerator() { throw null; }
324324

325325
public void IntersectWith(IEnumerable<T> other) { }
326326

@@ -423,7 +423,7 @@ public void CopyTo(T[] array, int index) { }
423423

424424
public LinkedListNode<T> FindLast(T value) { throw null; }
425425

426-
public LinkedList<T>.Enumerator GetEnumerator() { throw null; }
426+
public Enumerator GetEnumerator() { throw null; }
427427

428428
public bool Remove(T value) { throw null; }
429429

@@ -525,7 +525,7 @@ public void CopyTo(int index, T[] array, int arrayIndex, int count) { }
525525

526526
public void ForEach(Action<T> action) { }
527527

528-
public List<T>.Enumerator GetEnumerator() { throw null; }
528+
public Enumerator GetEnumerator() { throw null; }
529529

530530
public List<T> GetRange(int index, int count) { throw null; }
531531

@@ -625,7 +625,7 @@ public void CopyTo(T[] array, int arrayIndex) { }
625625

626626
public void Enqueue(T item) { }
627627

628-
public Queue<T>.Enumerator GetEnumerator() { throw null; }
628+
public Enumerator GetEnumerator() { throw null; }
629629

630630
public T Peek() { throw null; }
631631

@@ -669,7 +669,7 @@ public SortedDictionary(IDictionary<TKey, TValue> dictionary) { }
669669

670670
public TValue this[TKey key] { get { throw null; } set { } }
671671

672-
public SortedDictionary<TKey, TValue>.KeyCollection Keys { get { throw null; } }
672+
public KeyCollection Keys { get { throw null; } }
673673

674674
bool ICollection<KeyValuePair<TKey, TValue>>.IsReadOnly { get { throw null; } }
675675

@@ -695,7 +695,7 @@ public SortedDictionary(IDictionary<TKey, TValue> dictionary) { }
695695

696696
ICollection IDictionary.Values { get { throw null; } }
697697

698-
public SortedDictionary<TKey, TValue>.ValueCollection Values { get { throw null; } }
698+
public ValueCollection Values { get { throw null; } }
699699

700700
public void Add(TKey key, TValue value) { }
701701

@@ -707,7 +707,7 @@ public void Clear() { }
707707

708708
public void CopyTo(KeyValuePair<TKey, TValue>[] array, int index) { }
709709

710-
public SortedDictionary<TKey, TValue>.Enumerator GetEnumerator() { throw null; }
710+
public Enumerator GetEnumerator() { throw null; }
711711

712712
public bool Remove(TKey key) { throw null; }
713713

@@ -766,7 +766,7 @@ public KeyCollection(SortedDictionary<TKey, TValue> dictionary) { }
766766

767767
public void CopyTo(TKey[] array, int index) { }
768768

769-
public SortedDictionary<TKey, TValue>.KeyCollection.Enumerator GetEnumerator() { throw null; }
769+
public Enumerator GetEnumerator() { throw null; }
770770

771771
void ICollection<TKey>.Add(TKey item) { }
772772

@@ -810,7 +810,7 @@ public ValueCollection(SortedDictionary<TKey, TValue> dictionary) { }
810810

811811
public void CopyTo(TValue[] array, int index) { }
812812

813-
public SortedDictionary<TKey, TValue>.ValueCollection.Enumerator GetEnumerator() { throw null; }
813+
public Enumerator GetEnumerator() { throw null; }
814814

815815
void ICollection<TValue>.Add(TValue item) { }
816816

@@ -974,7 +974,7 @@ public void CopyTo(T[] array) { }
974974

975975
public void ExceptWith(IEnumerable<T> other) { }
976976

977-
public SortedSet<T>.Enumerator GetEnumerator() { throw null; }
977+
public Enumerator GetEnumerator() { throw null; }
978978

979979
public virtual SortedSet<T> GetViewBetween(T lowerValue, T upperValue) { throw null; }
980980

@@ -1044,7 +1044,7 @@ public void Clear() { }
10441044

10451045
public void CopyTo(T[] array, int arrayIndex) { }
10461046

1047-
public Stack<T>.Enumerator GetEnumerator() { throw null; }
1047+
public Enumerator GetEnumerator() { throw null; }
10481048

10491049
public T Peek() { throw null; }
10501050

‎src/referencePackages/src/system.composition.attributedmodel/8.0.0/System.Composition.AttributedModel.8.0.0.csproj‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFrameworks>net6.0;net7.0;net8.0;netstandard2.0</TargetFrameworks>
5+
<AssemblyName>System.Composition.AttributedModel</AssemblyName>
6+
</PropertyGroup>
7+
8+
</Project>

0 commit comments

Comments
 (0)