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
dotnet · Jan 22, 2024 · 1b84747 · 1b84747
1 parent a392d3e
commit 1b84747
Show file tree

Hide file tree

Showing 72 changed files with 4,680 additions and 92 deletions.
diff --git a/eng/Build.props b/eng/Build.props
@@ -26,6 +26,16 @@
     <DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\Microsoft.CodeAnalysis.CSharp.4.6.0.csproj" />
 
     <DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\System.Reflection.MetadataLoadContext.8.0.0.csproj" />
+
+    <DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\System.Composition.Runtime.8.0.0.csproj" />
+    <DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\System.Composition.Hosting.8.0.0.csproj" />
+    <DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\System.Composition.AttributedModel.8.0.0.csproj" />
+    <DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\System.Composition.Convention.8.0.0.csproj" />
+    <DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\System.Composition.TypedParts.8.0.0.csproj" />
+    <DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\System.Composition.8.0.0.csproj" />
+    <DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\System.IO.Pipelines.8.0.0.csproj" />
+    <DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\System.Text.Encoding.CodePages.8.0.0.csproj" />
+    <DependencyPackageProjects Include="$(RepoRoot)src\referencePackages\src\**\System.Threading.Channels.8.0.0.csproj" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(BuildDependencyPackageProjects)' == 'true'">

diff --git a/src/referencePackages/Directory.Build.targets b/src/referencePackages/Directory.Build.targets
@@ -112,16 +112,15 @@
           AfterTargets="CopyFilesToOutputDirectory">
 
     <ItemGroup>
-      <CompileForRelativePath Include="@(Compile)" />
-      <CompileForRelativePath Remove="$(RepoRoot)src\SourceBuildAssemblyMetdata.cs" />
+      <CompileWithRelativePath Include="@(Compile)" Condition="!$([System.String]::new('%(Identity)').StartsWith('/'))" />
     </ItemGroup>
 
     <Error
-      Condition="@(CompileForRelativePath->Count()) != 1"
+      Condition="@(CompileWithRelativePath->Count()) != 1"
       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." />
 
     <ItemGroup>
-      <FullCompileDir Include="$([System.IO.Directory]::GetParent('%(CompileForRelativePath.Identity)'))" />
+      <FullCompileDir Include="$([System.IO.Directory]::GetParent('%(CompileWithRelativePath.Identity)'))" />
       <RelativeCompileDir Include="$([MSBuild]::MakeRelative('$(MSBuildProjectDirectory)\', '%(FullCompileDir.Identity)'))" />
     </ItemGroup>
 

diff --git a/src/referencePackages/src/system.collections/4.3.0/ref/netstandard1.0/System.Collections.cs b/src/referencePackages/src/system.collections/4.3.0/ref/netstandard1.0/System.Collections.cs
@@ -104,7 +104,7 @@ public Dictionary(int capacity) { }
 
         public TValue this[TKey key] { get { throw null; } set { } }
 
-        public Dictionary<TKey, TValue>.KeyCollection Keys { get { throw null; } }
+        public KeyCollection Keys { get { throw null; } }
 
         bool ICollection<KeyValuePair<TKey, TValue>>.IsReadOnly { get { throw null; } }
 
@@ -130,7 +130,7 @@ public Dictionary(int capacity) { }
 
         ICollection IDictionary.Values { get { throw null; } }
 
-        public Dictionary<TKey, TValue>.ValueCollection Values { get { throw null; } }
+        public ValueCollection Values { get { throw null; } }
 
         public void Add(TKey key, TValue value) { }
 
@@ -140,7 +140,7 @@ public void Clear() { }
 
         public bool ContainsValue(TValue value) { throw null; }
 
-        public Dictionary<TKey, TValue>.Enumerator GetEnumerator() { throw null; }
+        public Enumerator GetEnumerator() { throw null; }
 
         public bool Remove(TKey key) { throw null; }
 
@@ -201,7 +201,7 @@ public KeyCollection(Dictionary<TKey, TValue> dictionary) { }
 
             public void CopyTo(TKey[] array, int index) { }
 
-            public Dictionary<TKey, TValue>.KeyCollection.Enumerator GetEnumerator() { throw null; }
+            public Enumerator GetEnumerator() { throw null; }
 
             void ICollection<TKey>.Add(TKey item) { }
 
@@ -245,7 +245,7 @@ public ValueCollection(Dictionary<TKey, TValue> dictionary) { }
 
             public void CopyTo(TValue[] array, int index) { }
 
-            public Dictionary<TKey, TValue>.ValueCollection.Enumerator GetEnumerator() { throw null; }
+            public Enumerator GetEnumerator() { throw null; }
 
             void ICollection<TValue>.Add(TValue item) { }
 
@@ -317,7 +317,7 @@ public void CopyTo(T[] array) { }
 
         public void ExceptWith(IEnumerable<T> other) { }
 
-        public HashSet<T>.Enumerator GetEnumerator() { throw null; }
+        public Enumerator GetEnumerator() { throw null; }
 
         public void IntersectWith(IEnumerable<T> other) { }
 
@@ -420,7 +420,7 @@ public void CopyTo(T[] array, int index) { }
 
         public LinkedListNode<T> FindLast(T value) { throw null; }
 
-        public LinkedList<T>.Enumerator GetEnumerator() { throw null; }
+        public Enumerator GetEnumerator() { throw null; }
 
         public bool Remove(T value) { throw null; }
 
@@ -518,7 +518,7 @@ public void CopyTo(int index, T[] array, int arrayIndex, int count) { }
 
         public int FindLastIndex(Predicate<T> match) { throw null; }
 
-        public List<T>.Enumerator GetEnumerator() { throw null; }
+        public Enumerator GetEnumerator() { throw null; }
 
         public List<T> GetRange(int index, int count) { throw null; }
 
@@ -618,7 +618,7 @@ public void CopyTo(T[] array, int arrayIndex) { }
 
         public void Enqueue(T item) { }
 
-        public Queue<T>.Enumerator GetEnumerator() { throw null; }
+        public Enumerator GetEnumerator() { throw null; }
 
         public T Peek() { throw null; }
 
@@ -662,7 +662,7 @@ public SortedDictionary(IDictionary<TKey, TValue> dictionary) { }
 
         public TValue this[TKey key] { get { throw null; } set { } }
 
-        public SortedDictionary<TKey, TValue>.KeyCollection Keys { get { throw null; } }
+        public KeyCollection Keys { get { throw null; } }
 
         bool ICollection<KeyValuePair<TKey, TValue>>.IsReadOnly { get { throw null; } }
 
@@ -684,7 +684,7 @@ public SortedDictionary(IDictionary<TKey, TValue> dictionary) { }
 
         ICollection IDictionary.Values { get { throw null; } }
 
-        public SortedDictionary<TKey, TValue>.ValueCollection Values { get { throw null; } }
+        public ValueCollection Values { get { throw null; } }
 
         public void Add(TKey key, TValue value) { }
 
@@ -696,7 +696,7 @@ public void Clear() { }
 
         public void CopyTo(KeyValuePair<TKey, TValue>[] array, int index) { }
 
-        public SortedDictionary<TKey, TValue>.Enumerator GetEnumerator() { throw null; }
+        public Enumerator GetEnumerator() { throw null; }
 
         public bool Remove(TKey key) { throw null; }
 
@@ -755,7 +755,7 @@ public KeyCollection(SortedDictionary<TKey, TValue> dictionary) { }
 
             public void CopyTo(TKey[] array, int index) { }
 
-            public SortedDictionary<TKey, TValue>.KeyCollection.Enumerator GetEnumerator() { throw null; }
+            public Enumerator GetEnumerator() { throw null; }
 
             void ICollection<TKey>.Add(TKey item) { }
 
@@ -799,7 +799,7 @@ public ValueCollection(SortedDictionary<TKey, TValue> dictionary) { }
 
             public void CopyTo(TValue[] array, int index) { }
 
-            public SortedDictionary<TKey, TValue>.ValueCollection.Enumerator GetEnumerator() { throw null; }
+            public Enumerator GetEnumerator() { throw null; }
 
             void ICollection<TValue>.Add(TValue item) { }
 
@@ -868,7 +868,7 @@ public void CopyTo(T[] array) { }
 
         public void ExceptWith(IEnumerable<T> other) { }
 
-        public SortedSet<T>.Enumerator GetEnumerator() { throw null; }
+        public Enumerator GetEnumerator() { throw null; }
 
         public virtual SortedSet<T> GetViewBetween(T lowerValue, T upperValue) { throw null; }
 
@@ -938,7 +938,7 @@ public void Clear() { }
 
         public void CopyTo(T[] array, int arrayIndex) { }
 
-        public Stack<T>.Enumerator GetEnumerator() { throw null; }
+        public Enumerator GetEnumerator() { throw null; }
 
         public T Peek() { throw null; }
 

diff --git a/src/referencePackages/src/system.collections/4.3.0/ref/netstandard1.3/System.Collections.cs b/src/referencePackages/src/system.collections/4.3.0/ref/netstandard1.3/System.Collections.cs
@@ -107,7 +107,7 @@ public Dictionary(int capacity) { }
 
         public TValue this[TKey key] { get { throw null; } set { } }
 
-        public Dictionary<TKey, TValue>.KeyCollection Keys { get { throw null; } }
+        public KeyCollection Keys { get { throw null; } }
 
         bool ICollection<KeyValuePair<TKey, TValue>>.IsReadOnly { get { throw null; } }
 
@@ -133,7 +133,7 @@ public Dictionary(int capacity) { }
 
         ICollection IDictionary.Values { get { throw null; } }
 
-        public Dictionary<TKey, TValue>.ValueCollection Values { get { throw null; } }
+        public ValueCollection Values { get { throw null; } }
 
         public void Add(TKey key, TValue value) { }
 
@@ -143,7 +143,7 @@ public void Clear() { }
 
         public bool ContainsValue(TValue value) { throw null; }
 
-        public Dictionary<TKey, TValue>.Enumerator GetEnumerator() { throw null; }
+        public Enumerator GetEnumerator() { throw null; }
 
         public bool Remove(TKey key) { throw null; }
 
@@ -204,7 +204,7 @@ public KeyCollection(Dictionary<TKey, TValue> dictionary) { }
 
             public void CopyTo(TKey[] array, int index) { }
 
-            public Dictionary<TKey, TValue>.KeyCollection.Enumerator GetEnumerator() { throw null; }
+            public Enumerator GetEnumerator() { throw null; }
 
             void ICollection<TKey>.Add(TKey item) { }
 
@@ -248,7 +248,7 @@ public ValueCollection(Dictionary<TKey, TValue> dictionary) { }
 
             public void CopyTo(TValue[] array, int index) { }
 
-            public Dictionary<TKey, TValue>.ValueCollection.Enumerator GetEnumerator() { throw null; }
+            public Enumerator GetEnumerator() { throw null; }
 
             void ICollection<TValue>.Add(TValue item) { }
 
@@ -320,7 +320,7 @@ public void CopyTo(T[] array) { }
 
         public void ExceptWith(IEnumerable<T> other) { }
 
-        public HashSet<T>.Enumerator GetEnumerator() { throw null; }
+        public Enumerator GetEnumerator() { throw null; }
 
         public void IntersectWith(IEnumerable<T> other) { }
 
@@ -423,7 +423,7 @@ public void CopyTo(T[] array, int index) { }
 
         public LinkedListNode<T> FindLast(T value) { throw null; }
 
-        public LinkedList<T>.Enumerator GetEnumerator() { throw null; }
+        public Enumerator GetEnumerator() { throw null; }
 
         public bool Remove(T value) { throw null; }
 
@@ -525,7 +525,7 @@ public void CopyTo(int index, T[] array, int arrayIndex, int count) { }
 
         public void ForEach(Action<T> action) { }
 
-        public List<T>.Enumerator GetEnumerator() { throw null; }
+        public Enumerator GetEnumerator() { throw null; }
 
         public List<T> GetRange(int index, int count) { throw null; }
 
@@ -625,7 +625,7 @@ public void CopyTo(T[] array, int arrayIndex) { }
 
         public void Enqueue(T item) { }
 
-        public Queue<T>.Enumerator GetEnumerator() { throw null; }
+        public Enumerator GetEnumerator() { throw null; }
 
         public T Peek() { throw null; }
 
@@ -669,7 +669,7 @@ public SortedDictionary(IDictionary<TKey, TValue> dictionary) { }
 
         public TValue this[TKey key] { get { throw null; } set { } }
 
-        public SortedDictionary<TKey, TValue>.KeyCollection Keys { get { throw null; } }
+        public KeyCollection Keys { get { throw null; } }
 
         bool ICollection<KeyValuePair<TKey, TValue>>.IsReadOnly { get { throw null; } }
 
@@ -695,7 +695,7 @@ public SortedDictionary(IDictionary<TKey, TValue> dictionary) { }
 
         ICollection IDictionary.Values { get { throw null; } }
 
-        public SortedDictionary<TKey, TValue>.ValueCollection Values { get { throw null; } }
+        public ValueCollection Values { get { throw null; } }
 
         public void Add(TKey key, TValue value) { }
 
@@ -707,7 +707,7 @@ public void Clear() { }
 
         public void CopyTo(KeyValuePair<TKey, TValue>[] array, int index) { }
 
-        public SortedDictionary<TKey, TValue>.Enumerator GetEnumerator() { throw null; }
+        public Enumerator GetEnumerator() { throw null; }
 
         public bool Remove(TKey key) { throw null; }
 
@@ -766,7 +766,7 @@ public KeyCollection(SortedDictionary<TKey, TValue> dictionary) { }
 
             public void CopyTo(TKey[] array, int index) { }
 
-            public SortedDictionary<TKey, TValue>.KeyCollection.Enumerator GetEnumerator() { throw null; }
+            public Enumerator GetEnumerator() { throw null; }
 
             void ICollection<TKey>.Add(TKey item) { }
 
@@ -810,7 +810,7 @@ public ValueCollection(SortedDictionary<TKey, TValue> dictionary) { }
 
             public void CopyTo(TValue[] array, int index) { }
 
-            public SortedDictionary<TKey, TValue>.ValueCollection.Enumerator GetEnumerator() { throw null; }
+            public Enumerator GetEnumerator() { throw null; }
 
             void ICollection<TValue>.Add(TValue item) { }
 
@@ -974,7 +974,7 @@ public void CopyTo(T[] array) { }
 
         public void ExceptWith(IEnumerable<T> other) { }
 
-        public SortedSet<T>.Enumerator GetEnumerator() { throw null; }
+        public Enumerator GetEnumerator() { throw null; }
 
         public virtual SortedSet<T> GetViewBetween(T lowerValue, T upperValue) { throw null; }
 
@@ -1044,7 +1044,7 @@ public void Clear() { }
 
         public void CopyTo(T[] array, int arrayIndex) { }
 
-        public Stack<T>.Enumerator GetEnumerator() { throw null; }
+        public Enumerator GetEnumerator() { throw null; }
 
         public T Peek() { throw null; }
 

diff --git a/.../system.composition.attributedmodel/8.0.0/System.Composition.AttributedModel.8.0.0.csproj b/.../system.composition.attributedmodel/8.0.0/System.Composition.AttributedModel.8.0.0.csproj
@@ -0,0 +1,8 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net6.0;net7.0;net8.0;netstandard2.0</TargetFrameworks>
+    <AssemblyName>System.Composition.AttributedModel</AssemblyName>
+  </PropertyGroup>
+
+</Project>