Skip to content

Commit

Permalink
Update .net versions.
Browse files Browse the repository at this point in the history
  • Loading branch information
charlesbetros committed Mar 14, 2016
1 parent 789db4e commit b283a07
Show file tree
Hide file tree
Showing 55 changed files with 150 additions and 112 deletions.
2 changes: 1 addition & 1 deletion Demos/Guess/Guess.Cosmos
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<SccProvider>SAK</SccProvider>
<SccAuxPath>SAK</SccAuxPath>
<SccLocalPath>SAK</SccLocalPath>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<Profile>VMware</Profile>
Expand Down
15 changes: 15 additions & 0 deletions Docs/Web.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0"?>
<configuration>
<!--
For a description of web.config changes see http://go.microsoft.com/fwlink/?LinkId=235367.
The following attributes can be set on the <httpRuntime> tag.
<system.Web>
<httpRuntime targetFramework="4.5.2" />
</system.Web>
-->
<system.web>
<compilation debug="false" targetFramework="4.5.2"/>
<pages controlRenderingCompatibilityVersion="4.0"/>
</system.web>
</configuration>
1 change: 1 addition & 0 deletions Setup/Cosmos.iss
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ Source: ".\Build\VSIP\Interop.VixCOM.dll"; DestDir: "{app}\Build\VSIP\"; Flags:
; ?? If we have this do we need the others?
Source: ".\Build\VSIP\Cosmos.*"; DestDir: "{app}\Build\VSIP\"; Flags: ignoreversion uninsremovereadonly
Source: ".\Build\VSIP\Cosmos.IL2CPU.*"; DestDir: "{app}\Build\VSIP\"; Flags: ignoreversion uninsremovereadonly
Source: ".\Resources\Dependencies\Microsoft.Samples.Debugging.CorApi.1.4.0.0\*.dll"; DestDir: "{app}\Build\VSIP\"; Flags: ignoreversion uninsremovereadonly
;Source: ".\Build\VSIP\corapi.*"; DestDir: "{app}\Build\VSIP\"; Flags: ignoreversion uninsremovereadonly
;Source: ".\Build\VSIP\raw.*"; DestDir: "{app}\Build\VSIP\"; Flags: ignoreversion uninsremovereadonly
;Source: ".\Resources\Dependencies\Mosa\Mosa.Utility.IsoImage.dll"; DestDir: "{app}\Build\VSIP\"; Flags: ignoreversion uninsremovereadonly
Expand Down
2 changes: 1 addition & 1 deletion Tests/BoxingTests/BoxingTestsBoot.Cosmos
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
<Name>BoxingTestsBoot</Name>
<BinFormat>elf</BinFormat>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<Profile>Bochs</Profile>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
<Name>Cosmos.Compiler.Tests.BclBoot</Name>
<BinFormat>elf</BinFormat>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<Profile>Bochs</Profile>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
<Name>Cosmos.Compiler.Tests.ExceptionsBoot</Name>
<BinFormat>elf</BinFormat>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<Profile>VMware</Profile>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
<Name>Cosmos.Compiler.Tests.InterfacesBoot</Name>
<BinFormat>elf</BinFormat>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<Profile>Bochs</Profile>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<RootNamespace>Compiler.Tests.MultidimensionalArrays</RootNamespace>
<AssemblyName>Compiler.Tests.MultidimensionalArrays</AssemblyName>
<FileAlignment>512</FileAlignment>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
<Name>Compiler.Tests.MultidimensionalArraysBoot</Name>
<BinFormat>elf</BinFormat>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<Profile>VMware</Profile>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
<Name>Cosmos.Compiler.Tests.SimpleWriteLine.KernelBoot</Name>
<BinFormat>elf</BinFormat>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<Profile>Bochs</Profile>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
<Name>Cosmos.Compiler.Tests.SingleEchoTestBoot</Name>
<BinFormat>elf</BinFormat>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<Profile>VMware</Profile>
Expand Down
2 changes: 1 addition & 1 deletion Tests/Cosmos.Compiler.Tests/Cosmos.Compiler.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Cosmos.Compiler.Tests</RootNamespace>
<AssemblyName>Cosmos.Compiler.Tests</AssemblyName>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
Expand Down
8 changes: 4 additions & 4 deletions Tests/Cosmos.Compiler.Tests/app.config
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="EntityFramework" publicKeyToken="b77a5c561934e089" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
<assemblyIdentity name="EntityFramework" publicKeyToken="b77a5c561934e089" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/></startup></configuration>
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
<Name>Cosmos.Kernel.Tests.FatBoot</Name>
<BinFormat>Elf</BinFormat>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<Profile>Bochs</Profile>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
<Name>Cosmos.Kernel.Tests.LinqTestsBoot</Name>
<BinFormat>elf</BinFormat>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<Profile>VMware</Profile>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
<Name>SimpleStructsAndArraysTestBoot</Name>
<BinFormat>elf</BinFormat>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<Profile>Bochs</Profile>
Expand Down
2 changes: 1 addition & 1 deletion Tests/VGACompilerCrash/VGACompilerCrashBoot.Cosmos
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
<Name>VGACompilerCrashBoot</Name>
<BinFormat>elf</BinFormat>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<Profile>VMware</Profile>
Expand Down
2 changes: 1 addition & 1 deletion Users/EdNutting/EdNuttingsTest/EdNuttingsTestBoot.Cosmos
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
<Name>EdNuttingsTestBoot</Name>
<BinFormat>elf</BinFormat>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<SccProjectName>SAK</SccProjectName>
<SccProvider>SAK</SccProvider>
<SccAuxPath>SAK</SccAuxPath>
Expand Down
2 changes: 1 addition & 1 deletion Users/Emile/TestBed/TestBed/TestBedBoot.Cosmos
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
<Name>TestBedBoot</Name>
<BinFormat>elf</BinFormat>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<Profile>VMware</Profile>
Expand Down
2 changes: 1 addition & 1 deletion Users/Geramy/GeramyLovelessTest/GeramyLovelessTest.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<SccLocalPath>SAK</SccLocalPath>
<SccAuxPath>SAK</SccAuxPath>
<SccProvider>SAK</SccProvider>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<TargetFrameworkProfile />
</PropertyGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Users/Geramy/GeramysTest2/GeramysTest.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<SccLocalPath>SAK</SccLocalPath>
<SccAuxPath>SAK</SccAuxPath>
<SccProvider>SAK</SccProvider>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
Expand Down
2 changes: 1 addition & 1 deletion Users/Geramy/GeramysTest2/GeramysTestBoot.Cosmos
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<SccProvider>SAK</SccProvider>
<SccAuxPath>SAK</SccAuxPath>
<SccLocalPath>SAK</SccLocalPath>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<Profile>VMware</Profile>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Cosmos.Assembler.X86.Gero</RootNamespace>
<AssemblyName>Cosmos.Assembler.X86.Gero</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SccProjectName>SAK</SccProjectName>
<SccLocalPath>SAK</SccLocalPath>
Expand Down
2 changes: 1 addition & 1 deletion Users/Kudzu/Breakpoints/Kudzu.Breakpoints.Cosmos
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<ProjectGuid>{e5647bfd-1507-4f02-a7d5-e0f9d6aece3a}</ProjectGuid>
<EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
<Name>Kudzu.Breakpoints</Name>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<SccProjectName>SAK</SccProjectName>
<SccProvider>SAK</SccProvider>
<SccAuxPath>SAK</SccAuxPath>
Expand Down
2 changes: 1 addition & 1 deletion Users/LWatson/LWatsonBoot.Cosmos
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
<Name>LWatsonBoot</Name>
<BinFormat>elf</BinFormat>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<SccProjectName>SAK</SccProjectName>
<SccProvider>SAK</SccProvider>
<SccAuxPath>SAK</SccAuxPath>
Expand Down
2 changes: 1 addition & 1 deletion Users/Matthijs/Playground/PlaygroundBoot.Cosmos
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<SccProvider>SAK</SccProvider>
<SccAuxPath>SAK</SccAuxPath>
<SccLocalPath>SAK</SccLocalPath>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<Profile>VMware</Profile>
Expand Down
2 changes: 1 addition & 1 deletion Users/SSchocke/SSchockeTest/SSchockeTest.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<SccLocalPath>SAK</SccLocalPath>
<SccAuxPath>SAK</SccAuxPath>
<SccProvider>SAK</SccProvider>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<TargetFrameworkProfile />
</PropertyGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Users/Sentinel/SentinelCore/SentinelCore.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>SentinelCore</RootNamespace>
<AssemblyName>SentinelCore</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Users/Sentinel/SentinelHAL/SentinelHAL.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>SentinelHAL</RootNamespace>
<AssemblyName>SentinelHAL</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Users/Sentinel/SentinelKernel/SentinelKernel.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<RootNamespace>SentinelKernel</RootNamespace>
<AssemblyName>SentinelKernel</AssemblyName>
<FileAlignment>512</FileAlignment>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<SccProjectName>SAK</SccProjectName>
<SccLocalPath>SAK</SccLocalPath>
<SccAuxPath>SAK</SccAuxPath>
Expand Down
2 changes: 1 addition & 1 deletion Users/Sentinel/SentinelKernel/SentinelKernelBoot.Cosmos
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
<Name>SentinelKernelBoot</Name>
<BinFormat>Elf</BinFormat>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<SccProjectName>SAK</SccProjectName>
<SccProvider>SAK</SccProvider>
<SccAuxPath>SAK</SccAuxPath>
Expand Down
2 changes: 1 addition & 1 deletion Users/Sentinel/SentinelSystem/SentinelSystem.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>SentinelKernel</RootNamespace>
<AssemblyName>SentinelSystem</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
Expand Down
3 changes: 2 additions & 1 deletion source/Cosmos.Build.Builder/Cosmos.Build.Builder.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Cosmos.Build.Builder</RootNamespace>
<AssemblyName>Cosmos.Build.Builder</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WarningLevel>4</WarningLevel>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>Cosmos.ico</ApplicationIcon>
Expand Down
Loading

0 comments on commit b283a07

Please sign in to comment.