Skip to content

Commit

Permalink
Revert .NET 4.0 to 4.5.2 (needs NInject update from second Windows XP…
Browse files Browse the repository at this point in the history 
… machine)
  • Loading branch information
@cyberluke
cyberluke committed Sep 17, 2022
1 parent 5a3b420 commit fa2a1bc
Show file tree
Hide file tree
Showing 13 changed files with 27 additions and 64 deletions.
8 changes: 4 additions & 4 deletions FreePIE.Console/FreePIE.Console.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>FreePIE.Console</RootNamespace>
<AssemblyName>FreePIE.Console</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
<FileAlignment>512</FileAlignment>
Expand Down Expand Up @@ -39,9 +39,9 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="Ninject, Version=3.2.0.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Ninject.3.2.2.0\lib\net40\Ninject.dll</HintPath>
<Reference Include="Ninject, Version=3.3.6.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
<HintPath>..\packages\Ninject.3.3.6\lib\net45\Ninject.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down
2 changes: 1 addition & 1 deletion FreePIE.Console/app.config
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/></startup></configuration>
2 changes: 1 addition & 1 deletion FreePIE.Console/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Ninject" version="3.2.2.0" targetFramework="net45" requireReinstallation="true" />
<package id="Ninject" version="3.3.6" targetFramework="net452" />
</packages>
5 changes: 3 additions & 2 deletions FreePIE.Core.Contracts/FreePIE.Core.Contracts.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
Expand All @@ -10,8 +10,9 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>FreePIE.Core.Contracts</RootNamespace>
<AssemblyName>FreePIE.Core.Contracts</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down
8 changes: 4 additions & 4 deletions FreePIE.Core/FreePIE.Core.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>FreePIE.Core</RootNamespace>
<AssemblyName>FreePIE.Core</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
Expand Down Expand Up @@ -53,9 +53,9 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Lib\IronPython\Microsoft.Scripting.dll</HintPath>
</Reference>
<Reference Include="Ninject, Version=3.2.0.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Ninject.3.2.2.0\lib\net40\Ninject.dll</HintPath>
<Reference Include="Ninject, Version=3.3.6.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
<HintPath>..\packages\Ninject.3.3.6\lib\net45\Ninject.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down
2 changes: 1 addition & 1 deletion FreePIE.Core/Services/ServiceBootstrapper.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ public Func<T, TCast> Create()
}
}

private sealed class PathsProvider : IProvider<IPaths>
private sealed class PathsProvider : IProvider
{
private readonly IPortable portable;
private readonly Func<PortablePaths> portablePaths;
Expand Down
2 changes: 1 addition & 1 deletion FreePIE.Core/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Ninject" version="3.2.2.0" targetFramework="net45" requireReinstallation="true" />
<package id="Ninject" version="3.3.6" targetFramework="net452" />
</packages>
2 changes: 1 addition & 1 deletion FreePIE.GUI.CodeCompletion/FreePIE.GUI.CodeCompletion.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>FreePIE.GUI.CodeCompletion</RootNamespace>
<AssemblyName>FreePIE.GUI.CodeCompletion</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
<FileAlignment>512</FileAlignment>
Expand Down
4 changes: 2 additions & 2 deletions FreePIE.GUI.CodeCompletion/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="AvalonEdit" version="5.0.2" targetFramework="net45" />
<package id="Caliburn.Micro" version="2.0.1" targetFramework="net45" requireReinstallation="true" />
<package id="Caliburn.Micro.Core" version="2.0.1" targetFramework="net45" requireReinstallation="true" />
<package id="Caliburn.Micro" version="2.0.1" targetFramework="net45" />
<package id="Caliburn.Micro.Core" version="2.0.1" targetFramework="net45" />
</packages>
9 changes: 5 additions & 4 deletions FreePIE.GUI/FreePIE.GUI.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>FreePIE.GUI</RootNamespace>
<AssemblyName>FreePIE</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
<FileAlignment>512</FileAlignment>
Expand Down Expand Up @@ -44,6 +44,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<PlatformTarget>x86</PlatformTarget>
Expand Down Expand Up @@ -74,9 +75,9 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\AvalonEdit.5.0.2\lib\Net40\ICSharpCode.AvalonEdit.dll</HintPath>
</Reference>
<Reference Include="Ninject, Version=3.2.0.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Ninject.3.2.2.0\lib\net40\Ninject.dll</HintPath>
<Reference Include="Ninject, Version=3.3.6.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
<HintPath>..\packages\Ninject.3.3.6\lib\net45\Ninject.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Windows.Interactivity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
Expand Down
2 changes: 1 addition & 1 deletion FreePIE.GUI/app.config
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/></startup></configuration>
6 changes: 3 additions & 3 deletions FreePIE.GUI/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="AvalonEdit" version="5.0.2" targetFramework="net45" />
<package id="Caliburn.Micro" version="2.0.1" targetFramework="net45" requireReinstallation="true" />
<package id="Caliburn.Micro.Core" version="2.0.1" targetFramework="net45" requireReinstallation="true" />
<package id="Ninject" version="3.2.2.0" targetFramework="net45" requireReinstallation="true" />
<package id="Caliburn.Micro" version="2.0.1" targetFramework="net45" />
<package id="Caliburn.Micro.Core" version="2.0.1" targetFramework="net45" />
<package id="Ninject" version="3.3.6" targetFramework="net452" />
</packages>
39 changes: 0 additions & 39 deletions FreePIE.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreePIE.Core.Plugins", "Fre
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{77C0351A-C1CF-4A50-BE67-4EC19DEA5ADD}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreePIE.Tests.Core.Plugins", "FreePIE.Tests.Core.Plugins\FreePIE.Tests.Core.Plugins.csproj", "{AB8FED7B-DCC4-4985-A031-BB97351C24E6}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreePIE.Tests.Core", "FreePIE.Tests.Core\FreePIE.Tests.Core.csproj", "{F8B146B6-E6D8-46A9-A9B8-C3EC9A2D8732}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreePIE.Tests.Test", "FreePIE.Tests.Test\FreePIE.Tests.Test.csproj", "{DFBE147A-E57B-42AC-A560-B69C6FAC1C38}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreePIE.GUI", "FreePIE.GUI\FreePIE.GUI.csproj", "{EF29A2A3-A29C-4D9A-A8E2-A59925DEA82D}"
ProjectSection(ProjectDependencies) = postProject
{65D8F959-C4AD-4EC9-9EFA-9EBB9D8CA7CB} = {65D8F959-C4AD-4EC9-9EFA-9EBB9D8CA7CB}
Expand Down Expand Up @@ -95,36 +89,6 @@ Global
{65D8F959-C4AD-4EC9-9EFA-9EBB9D8CA7CB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{65D8F959-C4AD-4EC9-9EFA-9EBB9D8CA7CB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{65D8F959-C4AD-4EC9-9EFA-9EBB9D8CA7CB}.Release|x86.ActiveCfg = Release|Any CPU
{AB8FED7B-DCC4-4985-A031-BB97351C24E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AB8FED7B-DCC4-4985-A031-BB97351C24E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AB8FED7B-DCC4-4985-A031-BB97351C24E6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{AB8FED7B-DCC4-4985-A031-BB97351C24E6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{AB8FED7B-DCC4-4985-A031-BB97351C24E6}.Debug|x86.ActiveCfg = Debug|Any CPU
{AB8FED7B-DCC4-4985-A031-BB97351C24E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AB8FED7B-DCC4-4985-A031-BB97351C24E6}.Release|Any CPU.Build.0 = Release|Any CPU
{AB8FED7B-DCC4-4985-A031-BB97351C24E6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{AB8FED7B-DCC4-4985-A031-BB97351C24E6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{AB8FED7B-DCC4-4985-A031-BB97351C24E6}.Release|x86.ActiveCfg = Release|Any CPU
{F8B146B6-E6D8-46A9-A9B8-C3EC9A2D8732}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F8B146B6-E6D8-46A9-A9B8-C3EC9A2D8732}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F8B146B6-E6D8-46A9-A9B8-C3EC9A2D8732}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{F8B146B6-E6D8-46A9-A9B8-C3EC9A2D8732}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{F8B146B6-E6D8-46A9-A9B8-C3EC9A2D8732}.Debug|x86.ActiveCfg = Debug|Any CPU
{F8B146B6-E6D8-46A9-A9B8-C3EC9A2D8732}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F8B146B6-E6D8-46A9-A9B8-C3EC9A2D8732}.Release|Any CPU.Build.0 = Release|Any CPU
{F8B146B6-E6D8-46A9-A9B8-C3EC9A2D8732}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{F8B146B6-E6D8-46A9-A9B8-C3EC9A2D8732}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{F8B146B6-E6D8-46A9-A9B8-C3EC9A2D8732}.Release|x86.ActiveCfg = Release|Any CPU
{DFBE147A-E57B-42AC-A560-B69C6FAC1C38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DFBE147A-E57B-42AC-A560-B69C6FAC1C38}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DFBE147A-E57B-42AC-A560-B69C6FAC1C38}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{DFBE147A-E57B-42AC-A560-B69C6FAC1C38}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{DFBE147A-E57B-42AC-A560-B69C6FAC1C38}.Debug|x86.ActiveCfg = Debug|Any CPU
{DFBE147A-E57B-42AC-A560-B69C6FAC1C38}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DFBE147A-E57B-42AC-A560-B69C6FAC1C38}.Release|Any CPU.Build.0 = Release|Any CPU
{DFBE147A-E57B-42AC-A560-B69C6FAC1C38}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{DFBE147A-E57B-42AC-A560-B69C6FAC1C38}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{DFBE147A-E57B-42AC-A560-B69C6FAC1C38}.Release|x86.ActiveCfg = Release|Any CPU
{EF29A2A3-A29C-4D9A-A8E2-A59925DEA82D}.Debug|Any CPU.ActiveCfg = Debug|x86
{EF29A2A3-A29C-4D9A-A8E2-A59925DEA82D}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{EF29A2A3-A29C-4D9A-A8E2-A59925DEA82D}.Debug|Mixed Platforms.Build.0 = Debug|x86
Expand All @@ -151,9 +115,6 @@ Global
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{D0368562-09D1-4E6E-8BD3-C1138764971E} = {77C0351A-C1CF-4A50-BE67-4EC19DEA5ADD}
{AB8FED7B-DCC4-4985-A031-BB97351C24E6} = {77C0351A-C1CF-4A50-BE67-4EC19DEA5ADD}
{F8B146B6-E6D8-46A9-A9B8-C3EC9A2D8732} = {77C0351A-C1CF-4A50-BE67-4EC19DEA5ADD}
{DFBE147A-E57B-42AC-A560-B69C6FAC1C38} = {77C0351A-C1CF-4A50-BE67-4EC19DEA5ADD}
EndGlobalSection
GlobalSection(TestCaseManagementSettings) = postSolution
CategoryFile = FreePIE.vsmdi
Expand Down

0 comments on commit fa2a1bc

Please sign in to comment.