Skip to content

Commit

Permalink
back to immutable collections 1.3
Browse files Browse the repository at this point in the history
  • Loading branch information
@scascarini
scascarini committed Mar 4, 2019
1 parent 7049144 commit 32dcc4d
Show file tree
Hide file tree
Showing 13 changed files with 38 additions and 16 deletions.
2 changes: 1 addition & 1 deletion BuildProj/packages.config
View file
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NakedObjects.Ide" version="9.0.1" targetFramework="net452" />
<package id="NakedObjects.Ide" version="9.0.2" targetFramework="net452" />
</packages>
4 changes: 2 additions & 2 deletions Core/NakedObjects.Architecture/NakedObjects.Architecture.csproj
View file
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.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 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>
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Core">
Expand Down
2 changes: 1 addition & 1 deletion Core/NakedObjects.Architecture/packages.config
View file
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.5.0" targetFramework="net462" />
<package id="System.Collections.Immutable" version="1.3.0" targetFramework="net462" />
</packages>
4 changes: 2 additions & 2 deletions Core/NakedObjects.Metamodel/NakedObjects.Metamodel.csproj
View file
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.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 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>
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.ComponentModel.DataAnnotations" />
Expand Down
2 changes: 1 addition & 1 deletion Core/NakedObjects.Metamodel/packages.config
View file
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.5.0" targetFramework="net462" />
<package id="System.Collections.Immutable" version="1.3.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
8 changes: 8 additions & 0 deletions Core/NakedObjects.ParallelReflector.Test/App.config
View file
Expand Up @@ -23,6 +23,14 @@
<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>
<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>
</assemblyBinding>
</runtime>
</configuration>
4 changes: 2 additions & 2 deletions Core/NakedObjects.ParallelReflector.Test/NakedObjects.ParallelReflector.Test.csproj
View file
Expand Up @@ -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.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 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>
<Reference Include="System.ComponentModel.DataAnnotations">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
Expand Down
2 changes: 1 addition & 1 deletion Core/NakedObjects.ParallelReflector.Test/packages.config
View file
Expand Up @@ -16,7 +16,7 @@
<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.Collections.Immutable" version="1.3.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" />
Expand Down
4 changes: 2 additions & 2 deletions Core/NakedObjects.ParallelReflector/NakedObjects.ParallelReflector.csproj
View file
Expand Up @@ -121,8 +121,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.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 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>
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.ComponentModel.DataAnnotations" />
Expand Down
2 changes: 1 addition & 1 deletion Core/NakedObjects.ParallelReflector/packages.config
View file
Expand Up @@ -6,7 +6,7 @@
<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" version="4.3.0" targetFramework="net462" />
<package id="System.Collections.Immutable" version="1.5.0" targetFramework="net462" />
<package id="System.Collections.Immutable" version="1.3.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
14 changes: 14 additions & 0 deletions Core/NakedObjects.Reflector.Test/App.config
View file
Expand Up @@ -18,5 +18,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>
4 changes: 2 additions & 2 deletions Core/NakedObjects.Reflector/NakedObjects.Reflector.csproj
View file
Expand Up @@ -121,8 +121,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.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 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>
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.ComponentModel.DataAnnotations" />
Expand Down
2 changes: 1 addition & 1 deletion Core/NakedObjects.Reflector/packages.config
View file
Expand Up @@ -6,7 +6,7 @@
<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" version="4.3.0" targetFramework="net462" />
<package id="System.Collections.Immutable" version="1.5.0" targetFramework="net462" />
<package id="System.Collections.Immutable" version="1.3.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

0 comments on commit 32dcc4d

Please sign in to comment.