Skip to content

Commit

Permalink
Revert "Build-time code generation for .NET Core (#3424)" (#3430)
Browse files Browse the repository at this point in the history
This reverts commit 26e0a1e.
  • Loading branch information
jason-bragg authored and benjaminpetit committed Sep 22, 2017
1 parent 26e0a1e commit ea4812a
Show file tree
Hide file tree
Showing 25 changed files with 448 additions and 833 deletions.
4 changes: 0 additions & 4 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
<GenerateDocumentationFile Condition="'$(Configuration)'=='Release'">true</GenerateDocumentationFile>
<NoWarn>$(NoWarn);1591</NoWarn>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
</PropertyGroup>

<!-- FSharp SDK overrides -->
Expand All @@ -44,23 +43,20 @@
<PropertyGroup>
<!-- System packages -->
<SystemRuntimeVersion>4.3.0</SystemRuntimeVersion>

<SystemCollectionsImmutableVersion>1.4.0</SystemCollectionsImmutableVersion>
<SystemNetHttpVersion>4.3.2</SystemNetHttpVersion>
<SystemReflectionMetadataVersion>1.5.0</SystemReflectionMetadataVersion>
<SystemReflectionTypeExtensionsVersion>4.4.0</SystemReflectionTypeExtensionsVersion>
<SystemValueTupleVersion>4.4.0</SystemValueTupleVersion>

<!-- Microsoft packages -->
<MicrosoftBuildVersion>15.3.409</MicrosoftBuildVersion>
<MicrosoftCodeAnalysisCSharpVersion>2.0.0</MicrosoftCodeAnalysisCSharpVersion>

<MicrosoftExtensionsConfigurationBinderVersion>2.0.0</MicrosoftExtensionsConfigurationBinderVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>2.0.0</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
<MicrosoftExtensionsConfigurationJsonVersion>2.0.0</MicrosoftExtensionsConfigurationJsonVersion>
<MicrosoftExtensionsConfigurationVersion>2.0.0</MicrosoftExtensionsConfigurationVersion>
<MicrosoftExtensionsDependencyInjection>2.0.0</MicrosoftExtensionsDependencyInjection>
<MicrosoftExtensionsDependencyModelVersion>2.0.0</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftExtensionsLoggingVersion>2.0.0</MicrosoftExtensionsLoggingVersion>
<MicrosoftExtensionsOptionsConfigurationExtensionsVersion>2.0.0</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
<MicrosoftExtensionsOptionsVersion>2.0.0</MicrosoftExtensionsOptionsVersion>
Expand Down
9 changes: 5 additions & 4 deletions Directory.Build.targets
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
<Project Condition=" '$(OrleansBuildTimeCodeGen)' == 'true' ">
<Project>
<!-- Begin Orleans: Without these lines the project won't build properly -->
<!-- Set path to code generator -->
<!-- Set path to ClientGenerator.exe -->
<PropertyGroup Condition=" '$(OrleansBuildTimeCodeGen)' == 'true' ">
<OrleansCodeGeneratorAssembly>$(SourceRoot)Bootstrap/$(Configuration)/ClientGenerator.dll</OrleansCodeGeneratorAssembly>
<!--<OrleansReferencesBase>$(ProjectDir)../Bootstrap/$(Configuration)</OrleansReferencesBase>-->
<OrleansReferencesBase>$(SourceRoot)/Bootstrap/$(Configuration)/</OrleansReferencesBase>
</PropertyGroup>
<Import Project="$(SourceRoot)src/ClientGenerator/build/Microsoft.Orleans.OrleansCodeGenerator.Build.targets" Condition=" '$(OrleansBuildTimeCodeGen)' == 'true' " />
<Import Project="$(SourceRoot)/src/Orleans.SDK.targets" Condition=" '$(OrleansBuildTimeCodeGen)' == 'true' and Exists('$(SourceRoot)/src/Orleans.SDK.targets') " />
<!--End Orleans -->
</Project>
84 changes: 21 additions & 63 deletions Orleans.sln
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26730.16
VisualStudioVersion = 15.0.26730.15
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{4CD3AA9E-D937-48CA-BB6C-158E12257D23}"
EndProject
Expand All @@ -10,6 +10,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Versions", "Versions", "{91
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Benchmarks", "Benchmarks", "{2CAB7894-777C-42B1-8B1E-322868CE92C7}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClientGenerator", "src\ClientGenerator\ClientGenerator.csproj", "{E782DD19-51F7-4F66-8217-BACAC33767E4}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Orleans", "src\Orleans\Orleans.csproj", "{BC1BD60C-E7D8-4452-A21C-290AEC8E2E74}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrleansCodeGenerator", "src\OrleansCodeGenerator\OrleansCodeGenerator.csproj", "{8D937706-F6DA-4D33-B0A9-24A260BD3080}"
Expand Down Expand Up @@ -118,15 +120,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Orleans.Core.Abstractions",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logging.Legacy", "src\Logging.Legacy\Logging.Legacy.csproj", "{0A5009BF-C7D2-463B-BF39-34E1F5EF2F23}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClientGenerator", "src\ClientGenerator\ClientGenerator.csproj", "{345B12A5-C5F3-4AFC-84AA-A8CC00F8D511}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "bootstrap", "bootstrap", "{DA143BBE-5D97-4792-8E36-44A3FA727C74}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Orleans.Bootstrap", "src\BootstrapBuild\Orleans\Orleans.Bootstrap.csproj", "{0CCA4C5C-1D31-4AA9-A7AF-90DD63C16F5B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClientGenerator.Bootstrap", "src\BootstrapBuild\ClientGenerator\ClientGenerator.Bootstrap.csproj", "{F7D70028-7E3B-48E3-92B9-DB889AE5ABD1}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrleansCodeGenerator.Bootstrap", "src\BootstrapBuild\OrleansCodeGenerator\OrleansCodeGenerator.Bootstrap.csproj", "{9B07237D-651C-497D-9E8D-EADC8FAF26FF}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{5A71FFF4-651D-4D9F-B57E-333D6CB38D27}"
ProjectSection(SolutionItems) = preProject
src\ClientGenerator\BootstrapCodegen.proj = src\ClientGenerator\BootstrapCodegen.proj
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Orleans.Transactions", "src\Orleans.Transactions\Orleans.Transactions.csproj", "{072B1B88-FE98-4354-86FA-AB6EF80EB9C4}"
EndProject
Expand All @@ -144,6 +141,18 @@ Global
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{E782DD19-51F7-4F66-8217-BACAC33767E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E782DD19-51F7-4F66-8217-BACAC33767E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E782DD19-51F7-4F66-8217-BACAC33767E4}.Debug|x64.ActiveCfg = Debug|Any CPU
{E782DD19-51F7-4F66-8217-BACAC33767E4}.Debug|x64.Build.0 = Debug|Any CPU
{E782DD19-51F7-4F66-8217-BACAC33767E4}.Debug|x86.ActiveCfg = Debug|Any CPU
{E782DD19-51F7-4F66-8217-BACAC33767E4}.Debug|x86.Build.0 = Debug|Any CPU
{E782DD19-51F7-4F66-8217-BACAC33767E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E782DD19-51F7-4F66-8217-BACAC33767E4}.Release|Any CPU.Build.0 = Release|Any CPU
{E782DD19-51F7-4F66-8217-BACAC33767E4}.Release|x64.ActiveCfg = Release|Any CPU
{E782DD19-51F7-4F66-8217-BACAC33767E4}.Release|x64.Build.0 = Release|Any CPU
{E782DD19-51F7-4F66-8217-BACAC33767E4}.Release|x86.ActiveCfg = Release|Any CPU
{E782DD19-51F7-4F66-8217-BACAC33767E4}.Release|x86.Build.0 = Release|Any CPU
{BC1BD60C-E7D8-4452-A21C-290AEC8E2E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BC1BD60C-E7D8-4452-A21C-290AEC8E2E74}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BC1BD60C-E7D8-4452-A21C-290AEC8E2E74}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -792,54 +801,6 @@ Global
{0A5009BF-C7D2-463B-BF39-34E1F5EF2F23}.Release|x64.Build.0 = Release|Any CPU
{0A5009BF-C7D2-463B-BF39-34E1F5EF2F23}.Release|x86.ActiveCfg = Release|Any CPU
{0A5009BF-C7D2-463B-BF39-34E1F5EF2F23}.Release|x86.Build.0 = Release|Any CPU
{345B12A5-C5F3-4AFC-84AA-A8CC00F8D511}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{345B12A5-C5F3-4AFC-84AA-A8CC00F8D511}.Debug|Any CPU.Build.0 = Debug|Any CPU
{345B12A5-C5F3-4AFC-84AA-A8CC00F8D511}.Debug|x64.ActiveCfg = Debug|Any CPU
{345B12A5-C5F3-4AFC-84AA-A8CC00F8D511}.Debug|x64.Build.0 = Debug|Any CPU
{345B12A5-C5F3-4AFC-84AA-A8CC00F8D511}.Debug|x86.ActiveCfg = Debug|Any CPU
{345B12A5-C5F3-4AFC-84AA-A8CC00F8D511}.Debug|x86.Build.0 = Debug|Any CPU
{345B12A5-C5F3-4AFC-84AA-A8CC00F8D511}.Release|Any CPU.ActiveCfg = Release|Any CPU
{345B12A5-C5F3-4AFC-84AA-A8CC00F8D511}.Release|Any CPU.Build.0 = Release|Any CPU
{345B12A5-C5F3-4AFC-84AA-A8CC00F8D511}.Release|x64.ActiveCfg = Release|Any CPU
{345B12A5-C5F3-4AFC-84AA-A8CC00F8D511}.Release|x64.Build.0 = Release|Any CPU
{345B12A5-C5F3-4AFC-84AA-A8CC00F8D511}.Release|x86.ActiveCfg = Release|Any CPU
{345B12A5-C5F3-4AFC-84AA-A8CC00F8D511}.Release|x86.Build.0 = Release|Any CPU
{0CCA4C5C-1D31-4AA9-A7AF-90DD63C16F5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0CCA4C5C-1D31-4AA9-A7AF-90DD63C16F5B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0CCA4C5C-1D31-4AA9-A7AF-90DD63C16F5B}.Debug|x64.ActiveCfg = Debug|Any CPU
{0CCA4C5C-1D31-4AA9-A7AF-90DD63C16F5B}.Debug|x64.Build.0 = Debug|Any CPU
{0CCA4C5C-1D31-4AA9-A7AF-90DD63C16F5B}.Debug|x86.ActiveCfg = Debug|Any CPU
{0CCA4C5C-1D31-4AA9-A7AF-90DD63C16F5B}.Debug|x86.Build.0 = Debug|Any CPU
{0CCA4C5C-1D31-4AA9-A7AF-90DD63C16F5B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0CCA4C5C-1D31-4AA9-A7AF-90DD63C16F5B}.Release|Any CPU.Build.0 = Release|Any CPU
{0CCA4C5C-1D31-4AA9-A7AF-90DD63C16F5B}.Release|x64.ActiveCfg = Release|Any CPU
{0CCA4C5C-1D31-4AA9-A7AF-90DD63C16F5B}.Release|x64.Build.0 = Release|Any CPU
{0CCA4C5C-1D31-4AA9-A7AF-90DD63C16F5B}.Release|x86.ActiveCfg = Release|Any CPU
{0CCA4C5C-1D31-4AA9-A7AF-90DD63C16F5B}.Release|x86.Build.0 = Release|Any CPU
{F7D70028-7E3B-48E3-92B9-DB889AE5ABD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F7D70028-7E3B-48E3-92B9-DB889AE5ABD1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F7D70028-7E3B-48E3-92B9-DB889AE5ABD1}.Debug|x64.ActiveCfg = Debug|Any CPU
{F7D70028-7E3B-48E3-92B9-DB889AE5ABD1}.Debug|x64.Build.0 = Debug|Any CPU
{F7D70028-7E3B-48E3-92B9-DB889AE5ABD1}.Debug|x86.ActiveCfg = Debug|Any CPU
{F7D70028-7E3B-48E3-92B9-DB889AE5ABD1}.Debug|x86.Build.0 = Debug|Any CPU
{F7D70028-7E3B-48E3-92B9-DB889AE5ABD1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F7D70028-7E3B-48E3-92B9-DB889AE5ABD1}.Release|Any CPU.Build.0 = Release|Any CPU
{F7D70028-7E3B-48E3-92B9-DB889AE5ABD1}.Release|x64.ActiveCfg = Release|Any CPU
{F7D70028-7E3B-48E3-92B9-DB889AE5ABD1}.Release|x64.Build.0 = Release|Any CPU
{F7D70028-7E3B-48E3-92B9-DB889AE5ABD1}.Release|x86.ActiveCfg = Release|Any CPU
{F7D70028-7E3B-48E3-92B9-DB889AE5ABD1}.Release|x86.Build.0 = Release|Any CPU
{9B07237D-651C-497D-9E8D-EADC8FAF26FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9B07237D-651C-497D-9E8D-EADC8FAF26FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9B07237D-651C-497D-9E8D-EADC8FAF26FF}.Debug|x64.ActiveCfg = Debug|Any CPU
{9B07237D-651C-497D-9E8D-EADC8FAF26FF}.Debug|x64.Build.0 = Debug|Any CPU
{9B07237D-651C-497D-9E8D-EADC8FAF26FF}.Debug|x86.ActiveCfg = Debug|Any CPU
{9B07237D-651C-497D-9E8D-EADC8FAF26FF}.Debug|x86.Build.0 = Debug|Any CPU
{9B07237D-651C-497D-9E8D-EADC8FAF26FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9B07237D-651C-497D-9E8D-EADC8FAF26FF}.Release|Any CPU.Build.0 = Release|Any CPU
{9B07237D-651C-497D-9E8D-EADC8FAF26FF}.Release|x64.ActiveCfg = Release|Any CPU
{9B07237D-651C-497D-9E8D-EADC8FAF26FF}.Release|x64.Build.0 = Release|Any CPU
{9B07237D-651C-497D-9E8D-EADC8FAF26FF}.Release|x86.ActiveCfg = Release|Any CPU
{9B07237D-651C-497D-9E8D-EADC8FAF26FF}.Release|x86.Build.0 = Release|Any CPU
{072B1B88-FE98-4354-86FA-AB6EF80EB9C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{072B1B88-FE98-4354-86FA-AB6EF80EB9C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{072B1B88-FE98-4354-86FA-AB6EF80EB9C4}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -871,6 +832,7 @@ Global
GlobalSection(NestedProjects) = preSolution
{9198D099-4C31-4017-8A02-E50C654CC7D4} = {A6573187-FD0D-4DF7-91D1-03E07E470C0A}
{2CAB7894-777C-42B1-8B1E-322868CE92C7} = {A6573187-FD0D-4DF7-91D1-03E07E470C0A}
{E782DD19-51F7-4F66-8217-BACAC33767E4} = {4CD3AA9E-D937-48CA-BB6C-158E12257D23}
{BC1BD60C-E7D8-4452-A21C-290AEC8E2E74} = {4CD3AA9E-D937-48CA-BB6C-158E12257D23}
{8D937706-F6DA-4D33-B0A9-24A260BD3080} = {4CD3AA9E-D937-48CA-BB6C-158E12257D23}
{8D33951F-683E-4513-8D7D-FB45206C9607} = {4CD3AA9E-D937-48CA-BB6C-158E12257D23}
Expand Down Expand Up @@ -921,14 +883,10 @@ Global
{8A652779-85EF-48E2-A639-1EED3CE2C39C} = {A6573187-FD0D-4DF7-91D1-03E07E470C0A}
{A4F61392-36A3-457C-80D0-9CDC48F5922F} = {A6573187-FD0D-4DF7-91D1-03E07E470C0A}
{1153256E-10C2-4729-ACDC-5DF18A7B92B5} = {4CD3AA9E-D937-48CA-BB6C-158E12257D23}
{6E5860C5-44E7-415C-80D6-3ECF15A80796} = {4CD3AA9E-D937-48CA-BB6C-158E12257D23}
{6E5860C5-44E7-415C-80D6-3ECF15A80796} = {FE2E08C6-9C3B-4AEE-AE07-CCA387580D7A}
{EBD697E3-91BE-4844-B3F0-6997300A8C12} = {A6573187-FD0D-4DF7-91D1-03E07E470C0A}
{73514686-D25D-478B-9943-A86F6B0F3A37} = {4CD3AA9E-D937-48CA-BB6C-158E12257D23}
{0A5009BF-C7D2-463B-BF39-34E1F5EF2F23} = {4CD3AA9E-D937-48CA-BB6C-158E12257D23}
{345B12A5-C5F3-4AFC-84AA-A8CC00F8D511} = {4CD3AA9E-D937-48CA-BB6C-158E12257D23}
{0CCA4C5C-1D31-4AA9-A7AF-90DD63C16F5B} = {DA143BBE-5D97-4792-8E36-44A3FA727C74}
{F7D70028-7E3B-48E3-92B9-DB889AE5ABD1} = {DA143BBE-5D97-4792-8E36-44A3FA727C74}
{9B07237D-651C-497D-9E8D-EADC8FAF26FF} = {DA143BBE-5D97-4792-8E36-44A3FA727C74}
{072B1B88-FE98-4354-86FA-AB6EF80EB9C4} = {4CD3AA9E-D937-48CA-BB6C-158E12257D23}
{CFD22413-CB67-40D6-B389-F038C8C38365} = {A6573187-FD0D-4DF7-91D1-03E07E470C0A}
{FE2E08C6-9C3B-4AEE-AE07-CCA387580D7A} = {4CD3AA9E-D937-48CA-BB6C-158E12257D23}
Expand Down

This file was deleted.

13 changes: 0 additions & 13 deletions src/BootstrapBuild/Directory.Build.props

This file was deleted.

1 change: 0 additions & 1 deletion src/BootstrapBuild/Directory.Build.targets

This file was deleted.

47 changes: 0 additions & 47 deletions src/BootstrapBuild/Orleans/Orleans.Bootstrap.csproj

This file was deleted.

This file was deleted.

Loading

0 comments on commit ea4812a

Please sign in to comment.