Skip to content

Commit

Permalink
More package updates
Browse files Browse the repository at this point in the history
  • Loading branch information
scascarini committed Mar 3, 2019
1 parent 42c53fe commit 7049144
Show file tree
Hide file tree
Showing 37 changed files with 467 additions and 207 deletions.
Expand Up @@ -123,8 +123,8 @@
<HintPath>..\..\packages\NakedObjects.ProgrammingModel.7.0.4\lib\net40\NakedObjects.Types.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Collections.Immutable, Version=1.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Collections.Immutable.1.3.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
<Reference Include="System.Collections.Immutable, Version=1.2.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Collections.Immutable.1.5.0\lib\netstandard2.0\System.Collections.Immutable.dll</HintPath>
</Reference>
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Core">
Expand Down
2 changes: 1 addition & 1 deletion Core/NakedObjects.Architecture/packages.config
Expand Up @@ -5,5 +5,5 @@
<package id="Microsoft.CSharp" version="4.5.0" targetFramework="net462" />
<package id="MSBuildTasks" version="1.5.0.235" targetFramework="net462" developmentDependency="true" />
<package id="NakedObjects.ProgrammingModel" version="7.0.4" targetFramework="net451" />
<package id="System.Collections.Immutable" version="1.3.0" targetFramework="net462" />
<package id="System.Collections.Immutable" version="1.5.0" targetFramework="net462" />
</packages>
15 changes: 9 additions & 6 deletions Core/NakedObjects.Core.Test/NakedObjects.Core.Test.csproj
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\packages\NUnit.3.10.1\build\NUnit.props" Condition="Exists('..\..\packages\NUnit.3.10.1\build\NUnit.props')" />
<Import Project="..\..\packages\NUnit.3.11.0\build\NUnit.props" Condition="Exists('..\..\packages\NUnit.3.11.0\build\NUnit.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
Expand Down Expand Up @@ -81,8 +81,8 @@
<HintPath>..\..\packages\Unity.3.5.1404.0\lib\net45\Microsoft.Practices.Unity.RegistrationByConvention.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Moq, Version=4.7.0.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
<HintPath>..\..\packages\Moq.4.7.0\lib\net45\Moq.dll</HintPath>
<Reference Include="Moq, Version=4.10.0.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
<HintPath>..\..\packages\Moq.4.10.1\lib\net45\Moq.dll</HintPath>
</Reference>
<Reference Include="NakedObjects.Attributes">
<HintPath>..\..\packages\NakedObjects.ProgrammingModel.7.0.4\lib\net40\NakedObjects.Attributes.dll</HintPath>
Expand All @@ -99,8 +99,8 @@
<HintPath>..\..\packages\NakedObjects.ProgrammingModel.7.0.4\lib\net40\NakedObjects.Types.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="nunit.framework, Version=3.10.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\..\packages\NUnit.3.10.1\lib\net45\nunit.framework.dll</HintPath>
<Reference Include="nunit.framework, Version=3.11.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\..\packages\NUnit.3.11.0\lib\net45\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />
Expand All @@ -111,6 +111,9 @@
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Threading.Tasks.Extensions.4.5.1\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Adapter\CollectionMementoTest.cs" />
Expand Down Expand Up @@ -177,7 +180,7 @@
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\..\packages\MSBuildTasks.1.5.0.235\build\MSBuildTasks.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\MSBuildTasks.1.5.0.235\build\MSBuildTasks.targets'))" />
<Error Condition="!Exists('..\..\packages\NUnit.3.10.1\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NUnit.3.10.1\build\NUnit.props'))" />
<Error Condition="!Exists('..\..\packages\NUnit.3.11.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NUnit.3.11.0\build\NUnit.props'))" />
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
14 changes: 14 additions & 0 deletions Core/NakedObjects.Core.Test/app.config
Expand Up @@ -15,5 +15,19 @@
</entityFramework>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" /></startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.1.1" newVersion="4.1.1.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.Extensions" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.1.1" newVersion="4.1.1.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.4.1" newVersion="4.0.4.1" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
5 changes: 3 additions & 2 deletions Core/NakedObjects.Core.Test/packages.config
Expand Up @@ -4,10 +4,10 @@
<package id="CommonServiceLocation" version="1.0.0" targetFramework="net452" />
<package id="CommonServiceLocator" version="2.0.4" targetFramework="net462" />
<package id="EntityFramework" version="6.2.0" targetFramework="net462" />
<package id="Moq" version="4.7.0" targetFramework="net462" />
<package id="Moq" version="4.10.1" targetFramework="net462" />
<package id="MSBuildTasks" version="1.5.0.235" targetFramework="net462" developmentDependency="true" />
<package id="NakedObjects.ProgrammingModel" version="7.0.4" targetFramework="net451" />
<package id="NUnit" version="3.10.1" targetFramework="net462" />
<package id="NUnit" version="3.11.0" targetFramework="net462" />
<package id="NUnit.ConsoleRunner" version="3.8.0" targetFramework="net462" />
<package id="NUnit.Extension.NUnitProjectLoader" version="3.6.0" targetFramework="net462" />
<package id="NUnit.Extension.NUnitV2Driver" version="3.7.0" targetFramework="net462" />
Expand All @@ -16,5 +16,6 @@
<package id="NUnit.Extension.VSProjectLoader" version="3.7.0" targetFramework="net462" />
<package id="NUnit.Runners" version="3.8.0" targetFramework="net462" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net462" />
<package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net462" />
<package id="Unity" version="3.5.1404.0" targetFramework="net462" />
</packages>
4 changes: 2 additions & 2 deletions Core/NakedObjects.Core.package/NakedObjects.Core.nuspec
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>NakedObjects.Core</id>
<version>10.0.0-beta02</version>
<version>10.0.0-rc01</version>
<authors>Naked Objects Group Ltd</authors>
<owners>Naked Objects Group Ltd</owners>
<licenseUrl>http://www.apache.org/licenses/LICENSE-2.0</licenseUrl>
Expand All @@ -17,7 +17,7 @@
<dependency id="NakedObjects.ProgrammingModel" version="[7.0.4, 8)" />
<dependency id="Common.Logging" version="[3.4.1, 4.0)" />
<dependency id="EntityFramework" version="[6.2.0, 7.0)" />
<dependency id="System.Collections.Immutable" version="[1.3.0, 2.0)" />
<dependency id="System.Collections.Immutable" version="[1.5.0, 2.0)" />
<dependency id="Unity" version="[3.5.1404, 4.0)" />
</dependencies>
</metadata>
Expand Down
Expand Up @@ -49,8 +49,8 @@
<HintPath>..\..\packages\Unity.3.5.1404.0\lib\net45\Microsoft.Practices.Unity.RegistrationByConvention.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Moq, Version=4.7.0.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
<HintPath>..\..\packages\Moq.4.7.0\lib\net45\Moq.dll</HintPath>
<Reference Include="Moq, Version=4.10.0.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
<HintPath>..\..\packages\Moq.4.10.1\lib\net45\Moq.dll</HintPath>
</Reference>
<Reference Include="NakedObjects.Attributes, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\NakedObjects.ProgrammingModel.7.0.4\lib\net40\NakedObjects.Attributes.dll</HintPath>
Expand All @@ -66,6 +66,9 @@
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Threading.Tasks.Extensions.4.5.1\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Adapter\TestIdentifierImpl.cs" />
Expand Down
14 changes: 14 additions & 0 deletions Core/NakedObjects.Metamodel.Test/app.config
Expand Up @@ -5,5 +5,19 @@
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.1.1" newVersion="4.1.1.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.Extensions" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.1.1" newVersion="4.1.1.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.4.1" newVersion="4.0.4.1" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
3 changes: 2 additions & 1 deletion Core/NakedObjects.Metamodel.Test/packages.config
Expand Up @@ -3,7 +3,7 @@
<package id="Castle.Core" version="4.3.1" targetFramework="net462" />
<package id="CommonServiceLocation" version="1.0.0" targetFramework="net452" />
<package id="CommonServiceLocator" version="2.0.4" targetFramework="net462" />
<package id="Moq" version="4.7.0" targetFramework="net462" />
<package id="Moq" version="4.10.1" targetFramework="net462" />
<package id="NakedObjects.ProgrammingModel" version="7.0.4" targetFramework="net451" />
<package id="NUnit.ConsoleRunner" version="3.8.0" targetFramework="net462" />
<package id="NUnit.Extension.NUnitProjectLoader" version="3.6.0" targetFramework="net462" />
Expand All @@ -13,5 +13,6 @@
<package id="NUnit.Extension.VSProjectLoader" version="3.7.0" targetFramework="net462" />
<package id="NUnit.Runners" version="3.8.0" targetFramework="net462" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net462" />
<package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net462" />
<package id="Unity" version="3.5.1404.0" targetFramework="net462" />
</packages>
4 changes: 2 additions & 2 deletions Core/NakedObjects.Metamodel/NakedObjects.Metamodel.csproj
Expand Up @@ -55,8 +55,8 @@
<HintPath>..\..\packages\NakedObjects.ProgrammingModel.7.0.4\lib\net40\NakedObjects.Types.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Collections.Immutable, Version=1.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Collections.Immutable.1.3.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
<Reference Include="System.Collections.Immutable, Version=1.2.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Collections.Immutable.1.5.0\lib\netstandard2.0\System.Collections.Immutable.dll</HintPath>
</Reference>
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.ComponentModel.DataAnnotations" />
Expand Down
2 changes: 1 addition & 1 deletion Core/NakedObjects.Metamodel/packages.config
Expand Up @@ -5,7 +5,7 @@
<package id="Microsoft.CSharp" version="4.5.0" targetFramework="net462" />
<package id="NakedObjects.ProgrammingModel" version="7.0.4" targetFramework="net451" />
<package id="System.Collections" version="4.3.0" targetFramework="net462" />
<package id="System.Collections.Immutable" version="1.3.0" targetFramework="net462" />
<package id="System.Collections.Immutable" version="1.5.0" targetFramework="net462" />
<package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net462" />
<package id="System.Globalization" version="4.3.0" targetFramework="net462" />
<package id="System.Linq" version="4.3.0" targetFramework="net462" />
Expand Down
6 changes: 6 additions & 0 deletions Core/NakedObjects.ParallelReflector.Test/App.config
Expand Up @@ -18,5 +18,11 @@
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.4.1" newVersion="4.0.4.1" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
Expand Up @@ -84,8 +84,8 @@
<HintPath>..\..\packages\Unity.3.5.1404.0\lib\net45\Microsoft.Practices.Unity.RegistrationByConvention.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Moq, Version=4.7.0.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
<HintPath>..\..\packages\Moq.4.7.0\lib\net45\Moq.dll</HintPath>
<Reference Include="Moq, Version=4.10.0.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
<HintPath>..\..\packages\Moq.4.10.1\lib\net45\Moq.dll</HintPath>
</Reference>
<Reference Include="NakedObjects.Attributes, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\NakedObjects.ProgrammingModel.7.0.4\lib\net40\NakedObjects.Attributes.dll</HintPath>
Expand All @@ -100,8 +100,8 @@
<HintPath>..\..\packages\NakedObjects.ProgrammingModel.7.0.4\lib\net40\NakedObjects.Types.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Collections.Immutable, Version=1.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Collections.Immutable.1.3.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
<Reference Include="System.Collections.Immutable, Version=1.2.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Collections.Immutable.1.5.0\lib\netstandard2.0\System.Collections.Immutable.dll</HintPath>
</Reference>
<Reference Include="System.ComponentModel.DataAnnotations">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
Expand All @@ -111,6 +111,12 @@
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Data" />
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Threading.Tasks.Extensions.4.5.1\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
Expand Down
19 changes: 14 additions & 5 deletions Core/NakedObjects.ParallelReflector.Test/packages.config
Expand Up @@ -3,12 +3,21 @@
<package id="Castle.Core" version="4.3.1" targetFramework="net462" />
<package id="Common.Logging" version="3.4.1" targetFramework="net462" />
<package id="Common.Logging.Core" version="3.4.1" targetFramework="net462" />
<package id="CommonServiceLocator" version="2.0.4" targetFramework="net462" />
<package id="EntityFramework" version="6.2.0" targetFramework="net462" />
<package id="Microsoft.Bcl.Immutable" version="1.0.34" targetFramework="net452" />
<package id="Microsoft.CSharp" version="4.5.0" targetFramework="net462" />
<package id="Moq" version="4.7.0" targetFramework="net462" />
<package id="Moq" version="4.10.1" targetFramework="net462" />
<package id="MSBuildTasks" version="1.5.0.235" targetFramework="net462" developmentDependency="true" />
<package id="NakedObjects.ProgrammingModel" version="7.0.4" targetFramework="net462" />
<package id="System.Collections.Immutable" version="1.3.0" targetFramework="net462" />
<package id="Unity" version="3.5.1404.0" targetFramework="net451" />
<package id="NakedObjects.ProgrammingModel" version="7.0.4" targetFramework="net451" />
<package id="NUnit.ConsoleRunner" version="3.8.0" targetFramework="net462" />
<package id="NUnit.Extension.NUnitProjectLoader" version="3.6.0" targetFramework="net462" />
<package id="NUnit.Extension.NUnitV2Driver" version="3.7.0" targetFramework="net462" />
<package id="NUnit.Extension.NUnitV2ResultWriter" version="3.6.0" targetFramework="net462" />
<package id="NUnit.Extension.TeamCityEventListener" version="1.0.4" targetFramework="net462" />
<package id="NUnit.Extension.VSProjectLoader" version="3.7.0" targetFramework="net462" />
<package id="NUnit.Runners" version="3.8.0" targetFramework="net462" />
<package id="System.Collections.Immutable" version="1.5.0" targetFramework="net462" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net462" />
<package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net462" />
<package id="Unity" version="3.5.1404.0" targetFramework="net462" />
</packages>

0 comments on commit 7049144

Please sign in to comment.