Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move from .NET 4.5.1 to 4.6.1. #2945

Merged
merged 2 commits into from
Apr 20, 2017
Merged

Move from .NET 4.5.1 to 4.6.1. #2945

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eca4962
Move from .NET 4.5.1 to 4.6.1.
jdom Apr 16, 2017
abe22cd
Output configuration file being used
jdom Apr 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/ClientGenerator/ClientGenerator.2017.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@
</PropertyGroup>

<PropertyGroup>
<TargetFramework>net451</TargetFramework>
<TargetFramework>net461</TargetFramework>
<OutputType>Exe</OutputType>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
<NoWarn>1591</NoWarn>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Orleans.CodeGeneration</RootNamespace>
Expand Down
6 changes: 4 additions & 2 deletions src/ClientGenerator/ClientGenerator.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,11 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Orleans.CodeGeneration</RootNamespace>
<AssemblyName>ClientGenerator</AssemblyName>
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
<DebugSymbols>true</DebugSymbols>
Expand Down Expand Up @@ -59,7 +61,6 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
</ItemGroup>
<ItemGroup>
<Compile Include="ClientGenerator.cs" />
Expand All @@ -81,6 +82,7 @@
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="project.json" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
6 changes: 3 additions & 3 deletions src/ClientGenerator/app.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup useLegacyV2RuntimeActivationPolicy="true">
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
</startup>
</configuration>
</configuration>
11 changes: 11 additions & 0 deletions src/ClientGenerator/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"dependencies": {
},
"frameworks": {
"net461": {}
},
"runtimes": {
"win-anycpu": {},
"win": {}
}
}
13 changes: 6 additions & 7 deletions src/NuGet/Microsoft.Orleans.Core.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,15 @@
<tags>Orleans Cloud-Computing Actor-Model Actors Distributed-Systems C# .NET</tags>
<dependencies>
<dependency id="Newtonsoft.Json" version="9.0.1" />
<dependency id="System.Collections.Immutable" version="1.1.37" />
<dependency id="System.Reflection.Metadata" version="1.2.0" />
<dependency id="Microsoft.Extensions.DependencyInjection" version="1.0.0" />
<dependency id="Microsoft.Extensions.DependencyInjection.Abstractions" version="1.0.0" />
<dependency id="System.Collections.Immutable" version="1.3.1" />
<dependency id="System.Reflection.Metadata" version="1.4.2" />
<dependency id="Microsoft.Extensions.DependencyInjection" version="1.1.0" />
</dependencies>
</metadata>
<files>
<file src="Orleans.dll" target="lib\net451" />
<file src="Orleans.pdb" target="lib\net451" />
<file src="Orleans.xml" target="lib\net451" />
<file src="Orleans.dll" target="lib\net461" />
<file src="Orleans.pdb" target="lib\net461" />
<file src="Orleans.xml" target="lib\net461" />
<file src="$SRC_DIR$Orleans\**\*.cs" target="src" />
</files>
</package>
6 changes: 3 additions & 3 deletions src/NuGet/Microsoft.Orleans.CounterControl.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
<dependency id="Microsoft.Orleans.Core" version="$version$" />
<dependency id="Microsoft.Orleans.OrleansRuntime" version="$version$" />
<dependency id="Microsoft.Orleans.OrleansTelemetryConsumers.Counters" version="$version$" />
<dependency id="Microsoft.CodeAnalysis.CSharp" version="1.3.2" />
<dependency id="Microsoft.CodeAnalysis.CSharp" version="2.0.0" />
</dependencies>
</metadata>
<files>
<file src="OrleansCounterControl.exe" target="lib\net451" />
<file src="OrleansCounterControl.pdb" target="lib\net451" />
<file src="OrleansCounterControl.exe" target="lib\net461" />
<file src="OrleansCounterControl.pdb" target="lib\net461" />
<file src="OrleansCounterControl.exe.config" target="tools" />
<file src="$SRC_DIR$OrleansCounterControl\**\*.cs" target="src" />
<file src="Microsoft.Orleans.CounterControl.targets" target="build" />
Expand Down
6 changes: 3 additions & 3 deletions src/NuGet/Microsoft.Orleans.EventSourcing.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
</dependencies>
</metadata>
<files>
<file src="OrleansEventSourcing.dll" target="lib\net451" />
<file src="OrleansEventSourcing.pdb" target="lib\net451" />
<file src="OrleansEventSourcing.xml" target="lib\net451" />
<file src="OrleansEventSourcing.dll" target="lib\net461" />
<file src="OrleansEventSourcing.pdb" target="lib\net461" />
<file src="OrleansEventSourcing.xml" target="lib\net461" />
<file src="$SRC_DIR$OrleansEventSourcing\**\*.cs" target="src" />
</files>
</package>
6 changes: 3 additions & 3 deletions src/NuGet/Microsoft.Orleans.OrleansAWSUtils.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
</dependencies>
</metadata>
<files>
<file src="OrleansAWSUtils.dll" target="lib\net451" />
<file src="OrleansAWSUtils.pdb" target="lib\net451" />
<file src="OrleansAWSUtils.xml" target="lib\net451" />
<file src="OrleansAWSUtils.dll" target="lib\net461" />
<file src="OrleansAWSUtils.pdb" target="lib\net461" />
<file src="OrleansAWSUtils.xml" target="lib\net461" />
<file src="$SRC_DIR$OrleansAWSUtils\**\*.cs" target="src" />
</files>
</package>
6 changes: 3 additions & 3 deletions src/NuGet/Microsoft.Orleans.OrleansAzureUtils.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
</dependencies>
</metadata>
<files>
<file src="OrleansAzureUtils.dll" target="lib\net451" />
<file src="OrleansAzureUtils.pdb" target="lib\net451" />
<file src="OrleansAzureUtils.xml" target="lib\net451" />
<file src="OrleansAzureUtils.dll" target="lib\net461" />
<file src="OrleansAzureUtils.pdb" target="lib\net461" />
<file src="OrleansAzureUtils.xml" target="lib\net461" />
<file src="$SRC_DIR$OrleansAzureUtils\**\*.cs" target="src" />
</files>
</package>
6 changes: 3 additions & 3 deletions src/NuGet/Microsoft.Orleans.OrleansCodeGenerator.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
<tags>Orleans Cloud-Computing Actor-Model Actors Distributed-Systems C# .NET</tags>
<dependencies>
<dependency id="Microsoft.Orleans.Core" version="$version$" />
<dependency id="Microsoft.CodeAnalysis.CSharp" version="1.3.2" />
<dependency id="Microsoft.CodeAnalysis.CSharp" version="2.0.0" />
</dependencies>
</metadata>
<files>
<file src="OrleansCodeGenerator.dll" target="lib\net451" />
<file src="OrleansCodeGenerator.xml" target="lib\net451" />
<file src="OrleansCodeGenerator.dll" target="lib\net461" />
<file src="OrleansCodeGenerator.xml" target="lib\net461" />
<file src="$SRC_DIR$OrleansCodeGenerator\**\*.cs" target="src" />
</files>
</package>
4 changes: 2 additions & 2 deletions src/NuGet/Microsoft.Orleans.OrleansConsulUtils.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
</dependencies>
</metadata>
<files>
<file src="OrleansConsulUtils.dll" target="lib\net451" />
<file src="OrleansConsulUtils.pdb" target="lib\net451" />
<file src="OrleansConsulUtils.dll" target="lib\net461" />
<file src="OrleansConsulUtils.pdb" target="lib\net461" />
<file src="$SRC_DIR$OrleansConsulUtils\**\*.cs" target="src" />
</files>
</package>
4 changes: 2 additions & 2 deletions src/NuGet/Microsoft.Orleans.OrleansHost.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
</dependencies>
</metadata>
<files>
<file src="OrleansHost.exe" target="lib\net451" />
<file src="OrleansHost.pdb" target="lib\net451" />
<file src="OrleansHost.exe" target="lib\net461" />
<file src="OrleansHost.pdb" target="lib\net461" />
<file src="OrleansHost.exe.config" target="tools" />
<file src="$SRC_DIR$OrleansHost\**\*.cs" target="src" />
<file src="Microsoft.Orleans.OrleansHost.targets" target="build" />
Expand Down
4 changes: 2 additions & 2 deletions src/NuGet/Microsoft.Orleans.OrleansManager.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
</dependencies>
</metadata>
<files>
<file src="OrleansManager.exe" target="lib\net451" />
<file src="OrleansManager.pdb" target="lib\net451" />
<file src="OrleansManager.exe" target="lib\net461" />
<file src="OrleansManager.pdb" target="lib\net461" />
<file src="OrleansManager.exe.config" target="tools" />
<file src="ClientConfiguration.xml" target="tools" />
<file src="$SRC_DIR$OrleansManager\**\*.cs" target="src" />
Expand Down
6 changes: 3 additions & 3 deletions src/NuGet/Microsoft.Orleans.OrleansProviders.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
</dependencies>
</metadata>
<files>
<file src="OrleansProviders.dll" target="lib\net451" />
<file src="OrleansProviders.pdb" target="lib\net451" />
<file src="OrleansProviders.xml" target="lib\net451" />
<file src="OrleansProviders.dll" target="lib\net461" />
<file src="OrleansProviders.pdb" target="lib\net461" />
<file src="OrleansProviders.xml" target="lib\net461" />
<file src="$SRC_DIR$OrleansProviders\**\*.cs" target="src" />
</files>
</package>
8 changes: 3 additions & 5 deletions src/NuGet/Microsoft.Orleans.OrleansRuntime.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,12 @@
<tags>Orleans Cloud-Computing Actor-Model Actors Distributed-Systems C# .NET</tags>
<dependencies>
<dependency id="Microsoft.Orleans.Core" version="$version$" />
<dependency id="Microsoft.Extensions.DependencyInjection" version="1.0.0" />
<dependency id="Microsoft.Extensions.DependencyInjection.Abstractions" version="1.0.0" />
</dependencies>
</metadata>
<files>
<file src="OrleansRuntime.dll" target="lib\net451" />
<file src="OrleansRuntime.pdb" target="lib\net451" />
<file src="OrleansRuntime.xml" target="lib\net451" />
<file src="OrleansRuntime.dll" target="lib\net461" />
<file src="OrleansRuntime.pdb" target="lib\net461" />
<file src="OrleansRuntime.xml" target="lib\net461" />
<file src="$SRC_DIR$OrleansRuntime\**\*.cs" target="src" />
</files>
</package>
6 changes: 3 additions & 3 deletions src/NuGet/Microsoft.Orleans.OrleansServiceBus.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
</dependencies>
</metadata>
<files>
<file src="OrleansServiceBus.dll" target="lib\net451" />
<file src="OrleansServiceBus.pdb" target="lib\net451" />
<file src="OrleansServiceBus.xml" target="lib\net451" />
<file src="OrleansServiceBus.dll" target="lib\net461" />
<file src="OrleansServiceBus.pdb" target="lib\net461" />
<file src="OrleansServiceBus.xml" target="lib\net461" />
<file src="$SRC_DIR$OrleansServiceBus\**\*.cs" target="src" />
</files>
</package>
12 changes: 6 additions & 6 deletions src/NuGet/Microsoft.Orleans.OrleansSqlUtils.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
</dependencies>
</metadata>
<files>
<file src="OrleansSqlUtils.dll" target="lib\net451" />
<file src="OrleansSqlUtils.pdb" target="lib\net451" />
<file src="OrleansSqlUtils.xml" target="lib\net451" />
<file src="CreateOrleansTables_SqlServer.sql" target="lib\net451\SQLServer" />
<file src="CreateOrleansTables_MySql.sql" target="lib\net451\MySql" />
<file src="CreateOrleansTables_PostgreSql.sql" target="lib\net451\PostgreSql" />
<file src="OrleansSqlUtils.dll" target="lib\net461" />
<file src="OrleansSqlUtils.pdb" target="lib\net461" />
<file src="OrleansSqlUtils.xml" target="lib\net461" />
<file src="CreateOrleansTables_SqlServer.sql" target="lib\net461\SQLServer" />
<file src="CreateOrleansTables_MySql.sql" target="lib\net461\MySql" />
<file src="CreateOrleansTables_PostgreSql.sql" target="lib\net461\PostgreSql" />
</files>
</package>
2 changes: 1 addition & 1 deletion src/NuGet/Microsoft.Orleans.OrleansTelemetryConsumers.AI.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@
</dependencies>
</metadata>
<files>
<file src="OrleansTelemetryConsumers.AI.dll" target="lib\net451" />
<file src="OrleansTelemetryConsumers.AI.dll" target="lib\net461" />
</files>
</package>
6 changes: 3 additions & 3 deletions src/NuGet/Microsoft.Orleans.OrleansTelemetryConsumers.Counters.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
</dependencies>
</metadata>
<files>
<file src="OrleansTelemetryConsumers.Counters.dll" target="lib\net451" />
<file src="OrleansTelemetryConsumers.Counters.pdb" target="lib\net451" />
<file src="OrleansTelemetryConsumers.Counters.xml" target="lib\net451" />
<file src="OrleansTelemetryConsumers.Counters.dll" target="lib\net461" />
<file src="OrleansTelemetryConsumers.Counters.pdb" target="lib\net461" />
<file src="OrleansTelemetryConsumers.Counters.xml" target="lib\net461" />
<file src="$SRC_DIR$OrleansTelemetryConsumers.Counters\**\*.cs" target="src" />
</files>
</package>
2 changes: 1 addition & 1 deletion src/NuGet/Microsoft.Orleans.OrleansTelemetryConsumers.NewRelic.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@
</dependencies>
</metadata>
<files>
<file src="OrleansTelemetryConsumers.NewRelic.dll" target="lib\net451" />
<file src="OrleansTelemetryConsumers.NewRelic.dll" target="lib\net461" />
</files>
</package>
6 changes: 3 additions & 3 deletions src/NuGet/Microsoft.Orleans.OrleansZooKeeperUtils.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
</dependencies>
</metadata>
<files>
<file src="OrleansZooKeeperUtils.dll" target="lib\net451" />
<file src="OrleansZooKeeperUtils.pdb" target="lib\net451" />
<file src="OrleansZooKeeperUtils.xml" target="lib\net451" />
<file src="OrleansZooKeeperUtils.dll" target="lib\net461" />
<file src="OrleansZooKeeperUtils.pdb" target="lib\net461" />
<file src="OrleansZooKeeperUtils.xml" target="lib\net461" />
<file src="$SRC_DIR$OrleansZooKeeperUtils\**\*.cs" target="src" />
</files>
</package>
6 changes: 3 additions & 3 deletions src/NuGet/Microsoft.Orleans.Serialization.Bond.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
</dependencies>
</metadata>
<files>
<file src="OrleansBondUtils.dll" target="lib\net451" />
<file src="OrleansBondUtils.pdb" target="lib\net451" />
<file src="OrleansBondUtils.xml" target="lib\net451" />
<file src="OrleansBondUtils.dll" target="lib\net461" />
<file src="OrleansBondUtils.pdb" target="lib\net461" />
<file src="OrleansBondUtils.xml" target="lib\net461" />
<file src="BondSerializerInstall.ps1" target="tools\Install.ps1" />
<file src="BondSerializerUninstall.ps1" target="tools\Uninstall.ps1" />
<file src="$SRC_DIR$OrleansBondUtils\**\*.cs" target="src" />
Expand Down
6 changes: 3 additions & 3 deletions src/NuGet/Microsoft.Orleans.ServiceFabric.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
</dependencies>
</metadata>
<files>
<file src="Microsoft.Orleans.ServiceFabric.dll" target="lib\net451" />
<file src="Microsoft.Orleans.ServiceFabric.pdb" target="lib\net451" />
<file src="Microsoft.Orleans.ServiceFabric.xml" target="lib\net451" />
<file src="Microsoft.Orleans.ServiceFabric.dll" target="lib\net461" />
<file src="Microsoft.Orleans.ServiceFabric.pdb" target="lib\net461" />
<file src="Microsoft.Orleans.ServiceFabric.xml" target="lib\net461" />
<file src="$SRC_DIR$OrleansServiceFabricUtils\**\*.cs" exclude="*\obj\**\*" target="src" />
</files>
</package>
8 changes: 4 additions & 4 deletions src/NuGet/Microsoft.Orleans.TestingHost.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
<dependency id="Microsoft.Orleans.Core" version="$version$" />
<dependency id="Microsoft.Orleans.OrleansRuntime" version="$version$" />
<dependency id="Microsoft.Orleans.OrleansProviders" version="$version$" />
<dependency id="Microsoft.Extensions.Configuration.Binder" version="1.0.0" />
<dependency id="Microsoft.Extensions.Configuration.Binder" version="1.1.1" />
</dependencies>
</metadata>
<files>
<file src="OrleansTestingHost.dll" target="lib\net451" />
<file src="OrleansTestingHost.pdb" target="lib\net451" />
<file src="OrleansTestingHost.xml" target="lib\net451" />
<file src="OrleansTestingHost.dll" target="lib\net461" />
<file src="OrleansTestingHost.pdb" target="lib\net461" />
<file src="OrleansTestingHost.xml" target="lib\net461" />
<file src="$SRC_DIR$OrleansTestingHost\**\*.cs" target="src" />
</files>
</package>
4 changes: 2 additions & 2 deletions src/Orleans.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
# Visual Studio 15
VisualStudioVersion = 15.0.26403.7
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{013DFD29-E1DB-4968-A67B-C2342E6F5B6E}"
ProjectSection(SolutionItems) = preProject
Expand Down
10 changes: 1 addition & 9 deletions src/Orleans/Configuration/ConfigUtilities.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -627,22 +627,14 @@ public static string RuntimeVersionInfo()
#if !NETSTANDARD_TODO
// TODO: could use Microsoft.Extensions.PlatformAbstractions package to get this info
sb.Append(" .NET version: ").AppendLine(Environment.Version.ToString());
sb.Append(" Is .NET 4.5=").AppendLine(IsNet45OrNewer().ToString());
sb.Append(" OS version: ").AppendLine(Environment.OSVersion.ToString());
sb.Append(" App config file: ").AppendLine(AppDomain.CurrentDomain.SetupInformation.ConfigurationFile);
#endif
sb.AppendFormat(" GC Type={0} GCLatencyMode={1}",
GCSettings.IsServerGC ? "Server" : "Client",
Enum.GetName(typeof(GCLatencyMode), GCSettings.LatencyMode))
.AppendLine();
return sb.ToString();
}

internal static bool IsNet45OrNewer()
{
// From: http://stackoverflow.com/questions/8517159/how-to-detect-at-runtime-that-net-version-4-5-currently-running-your-code

// Class "ReflectionContext" exists from .NET 4.5 onwards.
return Type.GetType("System.Reflection.ReflectionContext", false) != null;
}
}
}
Loading