xamarin
/
xamarin-macios
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Fix version numbers in FrameworkList.xml files (#7161) 

The existing test only checked that an assembly was mentioned in the file, but not that its version etc matches.
Updated the test and fixed the differences.
This commit is contained in:
Alexander Köplinger 2019-10-04 20:26:28 +02:00 коммит произвёл Sebastien Pouliot
Родитель bffca7df7b
Коммит 12831b3c36
6 изменённых файлов: 16 добавлений и 6 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
msbuild/Xamarin.Mac.Tasks/Xamarin.Mac-Full-FrameworkList.xml.in
Просмотреть файл

@ -187,5 +187,5 @@
<File AssemblyName="System.Xml.XmlDocument" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" /> <File AssemblyName="System.Xml.XmlDocument" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
<File AssemblyName="System.Xml.XmlSerializer" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" /> <File AssemblyName="System.Xml.XmlSerializer" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
<File AssemblyName="System.Xml.Xsl.Primitives" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" /> <File AssemblyName="System.Xml.Xsl.Primitives" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
<File AssemblyName="netstandard" Version="2.0.0.0" PublicKeyToken="cc7b13ffcd2ddd51" ProcessorArchitecture="MSIL" /> <File AssemblyName="netstandard" Version="2.1.0.0" PublicKeyToken="cc7b13ffcd2ddd51" ProcessorArchitecture="MSIL" />
</FileList> </FileList>

4
msbuild/Xamarin.Mac.Tasks/Xamarin.Mac-Mobile-FrameworkList.xml.in
Просмотреть файл

@ -17,7 +17,7 @@
<File AssemblyName="System.ComponentModel.Composition" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" /> <File AssemblyName="System.ComponentModel.Composition" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
<File AssemblyName="System.ComponentModel.DataAnnotations" Version="2.0.5.0" PublicKeyToken="31bf3856ad364e35" ProcessorArchitecture="MSIL" /> <File AssemblyName="System.ComponentModel.DataAnnotations" Version="2.0.5.0" PublicKeyToken="31bf3856ad364e35" ProcessorArchitecture="MSIL" />
<File AssemblyName="System.Core" Version="2.0.5.0" PublicKeyToken="7cec85d7bea7798e" ProcessorArchitecture="MSIL" /> <File AssemblyName="System.Core" Version="2.0.5.0" PublicKeyToken="7cec85d7bea7798e" ProcessorArchitecture="MSIL" />
<File AssemblyName="System.Data.DataSetExtensions" Version="4.0.0.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" /> <File AssemblyName="System.Data.DataSetExtensions" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
<File AssemblyName="System.Data.Services.Client" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" /> <File AssemblyName="System.Data.Services.Client" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
<File AssemblyName="System.Data" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" /> <File AssemblyName="System.Data" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
<File AssemblyName="System.IO.Compression.FileSystem" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" /> <File AssemblyName="System.IO.Compression.FileSystem" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
@ -186,5 +186,5 @@
<File AssemblyName="System.Xml.XmlDocument" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" /> <File AssemblyName="System.Xml.XmlDocument" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
<File AssemblyName="System.Xml.XmlSerializer" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" /> <File AssemblyName="System.Xml.XmlSerializer" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
<File AssemblyName="System.Xml.Xsl.Primitives" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" /> <File AssemblyName="System.Xml.Xsl.Primitives" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
<File AssemblyName="netstandard" Version="2.0.0.0" PublicKeyToken="cc7b13ffcd2ddd51" ProcessorArchitecture="MSIL" /> <File AssemblyName="netstandard" Version="2.1.0.0" PublicKeyToken="cc7b13ffcd2ddd51" ProcessorArchitecture="MSIL" />
</FileList> </FileList>

2
msbuild/Xamarin.iOS.Tasks.Core/Xamarin.TVOS-FrameworkList.xml.in
Просмотреть файл

@ -187,5 +187,5 @@
<File AssemblyName="System.Xml.XmlDocument" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" /> <File AssemblyName="System.Xml.XmlDocument" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
<File AssemblyName="System.Xml.XmlSerializer" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" /> <File AssemblyName="System.Xml.XmlSerializer" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
<File AssemblyName="System.Xml.Xsl.Primitives" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" /> <File AssemblyName="System.Xml.Xsl.Primitives" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
<File AssemblyName="netstandard" Version="2.0.0.0" PublicKeyToken="cc7b13ffcd2ddd51" ProcessorArchitecture="MSIL" /> <File AssemblyName="netstandard" Version="2.1.0.0" PublicKeyToken="cc7b13ffcd2ddd51" ProcessorArchitecture="MSIL" />
</FileList> </FileList>

2
msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS-FrameworkList.xml.in
Просмотреть файл

@ -183,5 +183,5 @@
<File AssemblyName="System.Xml.XmlDocument" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" /> <File AssemblyName="System.Xml.XmlDocument" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
<File AssemblyName="System.Xml.XmlSerializer" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" /> <File AssemblyName="System.Xml.XmlSerializer" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
<File AssemblyName="System.Xml.Xsl.Primitives" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" /> <File AssemblyName="System.Xml.Xsl.Primitives" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
<File AssemblyName="netstandard" Version="2.0.0.0" PublicKeyToken="cc7b13ffcd2ddd51" ProcessorArchitecture="MSIL" /> <File AssemblyName="netstandard" Version="2.1.0.0" PublicKeyToken="cc7b13ffcd2ddd51" ProcessorArchitecture="MSIL" />
</FileList> </FileList>

2
msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS-FrameworkList.xml.in
Просмотреть файл

@ -187,5 +187,5 @@
<File AssemblyName="System.Xml.XmlDocument" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" /> <File AssemblyName="System.Xml.XmlDocument" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
<File AssemblyName="System.Xml.XmlSerializer" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" /> <File AssemblyName="System.Xml.XmlSerializer" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
<File AssemblyName="System.Xml.Xsl.Primitives" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" /> <File AssemblyName="System.Xml.Xsl.Primitives" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
<File AssemblyName="netstandard" Version="2.0.0.0" PublicKeyToken="cc7b13ffcd2ddd51" ProcessorArchitecture="MSIL" /> <File AssemblyName="netstandard" Version="2.1.0.0" PublicKeyToken="cc7b13ffcd2ddd51" ProcessorArchitecture="MSIL" />
</FileList> </FileList>

10
msbuild/tests/Xamarin.iOS.Tasks.Tests/FrameworkListTest.cs
Просмотреть файл

@ -35,6 +35,8 @@ namespace Xamarin.iOS.Tasks
foreach (var assembly in installedAssemblies) { foreach (var assembly in installedAssemblies) {
if (!frameworkListAssemblies.Any (a => a.Name == assembly.Name)) if (!frameworkListAssemblies.Any (a => a.Name == assembly.Name))
ReportAssemblies (assembly, $"One or more assemblies in the the SDK root folder are not listed in '{frameworkListFile}'. Update the list if an assembly was intentionally added."); ReportAssemblies (assembly, $"One or more assemblies in the the SDK root folder are not listed in '{frameworkListFile}'. Update the list if an assembly was intentionally added.");
else if (!frameworkListAssemblies.Single (a => a.Name == assembly.Name).Equals (assembly))
ReportAssemblies (assembly, $"One or more assemblies in the the SDK root folder do not match the entry in '{frameworkListFile}'. Update the list if an assembly was intentionally modified.");
} }
} }
@ -158,5 +160,13 @@ namespace Xamarin.iOS.Tasks
if (j == -1) j = fn.Length; if (j == -1) j = fn.Length;
PublicKeyToken = fn.Substring (i, j - i); PublicKeyToken = fn.Substring (i, j - i);
} }
public bool Equals (AssemblyInfo other) {
// ignore Culture and InGac for equality since those are not mentioned in the FrameworkList.xml
return other.Name == this.Name &&
other.Version == this.Version &&
other.PublicKeyToken == this.PublicKeyToken &&
other.ProcessorArchitecture == this.ProcessorArchitecture;
}
} }
} }