diff --git a/.gitignore b/.gitignore index 95cb0c41a3..7cbc987774 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,9 @@ # Orleans code-gen files orleans.codegen.cs +orleans.codegen.fs orleans.codegen.vb +src/SDK/VSIX/ # User-specific files *.suo diff --git a/src/OrleansVSTools/OrleansVSTools.sln b/src/OrleansVSTools/OrleansVSTools.sln index 3d05790558..0e5db1713a 100644 --- a/src/OrleansVSTools/OrleansVSTools.sln +++ b/src/OrleansVSTools/OrleansVSTools.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 -VisualStudioVersion = 12.0.30723.0 +VisualStudioVersion = 12.0.31101.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B888D741-4D06-4228-A2BF-DE088A9E6129}" ProjectSection(SolutionItems) = preProject @@ -10,6 +10,22 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution ..\SDK\UninstallOrleansVSTools.cmd = ..\SDK\UninstallOrleansVSTools.cmd EndProjectSection EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Project Templates", "Project Templates", "{CE88569C-DAB3-4BDA-8064-B54C0104683D}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Item Templates", "Item Templates", "{5483408F-F69F-4C69-91A5-1168808F12E0}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CSharp", "CSharp", "{80954E2B-831D-431A-B1AA-0DE9CEFD1680}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VB.NET", "VB.NET", "{5BB4C396-014C-4E89-B7CB-B9113F1A55FE}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FSharp", "FSharp", "{B38C64AF-4EFB-4C37-9C3B-33903B00824C}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CSharp", "CSharp", "{214B0F61-75F7-4295-AED9-3D7DB20D8054}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VB.NET", "VB.NET", "{A769E993-9F23-41EC-9453-79A171565D8B}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FSharp", "FSharp", "{464D872D-C9CA-4C2F-9FEC-7AC1FE071845}" +EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VSItemTemplateGrainInterface", "VSItemTemplateGrainInterface\VSItemTemplateGrainInterface.csproj", "{4DBFB7F4-512C-4963-880A-7D1D367D5C11}" ProjectSection(ProjectDependencies) = postProject {94D7BBD0-33AE-4CAB-A398-585281C5459A} = {94D7BBD0-33AE-4CAB-A398-585281C5459A} @@ -69,187 +85,81 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "VSProjectTemplateGrainImple EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OrleansVSTools", "OrleansVSTools\OrleansVSTools.csproj", "{E8BF3F9B-EAA4-48E9-AC31-59DE955B60EE}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{29E70989-6611-4ED7-B8EC-1B7EE06E7246}" - ProjectSection(SolutionItems) = preProject - .nuget\NuGet.Config = .nuget\NuGet.Config - .nuget\NuGet.targets = .nuget\NuGet.targets - EndProjectSection -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Project Templates", "Project Templates", "{CE88569C-DAB3-4BDA-8064-B54C0104683D}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Item Templates", "Item Templates", "{5483408F-F69F-4C69-91A5-1168808F12E0}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CSharp", "CSharp", "{80954E2B-831D-431A-B1AA-0DE9CEFD1680}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VB.NET", "VB.NET", "{5BB4C396-014C-4E89-B7CB-B9113F1A55FE}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FSharp", "FSharp", "{B38C64AF-4EFB-4C37-9C3B-33903B00824C}" -EndProject Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "VSItemTemplateGrainImplementationFSharp", "VSItemTemplateGrainImplementationFSharp\VSItemTemplateGrainImplementationFSharp.fsproj", "{0F56F737-7B9D-4546-823B-BCD41565E0DE}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CSharp", "CSharp", "{214B0F61-75F7-4295-AED9-3D7DB20D8054}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VB.NET", "VB.NET", "{A769E993-9F23-41EC-9453-79A171565D8B}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FSharp", "FSharp", "{464D872D-C9CA-4C2F-9FEC-7AC1FE071845}" -EndProject Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU - Debug|Mixed Platforms = Debug|Mixed Platforms - Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU - Release|Mixed Platforms = Release|Mixed Platforms - Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {4DBFB7F4-512C-4963-880A-7D1D367D5C11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4DBFB7F4-512C-4963-880A-7D1D367D5C11}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4DBFB7F4-512C-4963-880A-7D1D367D5C11}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {4DBFB7F4-512C-4963-880A-7D1D367D5C11}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {4DBFB7F4-512C-4963-880A-7D1D367D5C11}.Debug|x86.ActiveCfg = Debug|Any CPU {4DBFB7F4-512C-4963-880A-7D1D367D5C11}.Release|Any CPU.ActiveCfg = Release|Any CPU {4DBFB7F4-512C-4963-880A-7D1D367D5C11}.Release|Any CPU.Build.0 = Release|Any CPU - {4DBFB7F4-512C-4963-880A-7D1D367D5C11}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {4DBFB7F4-512C-4963-880A-7D1D367D5C11}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {4DBFB7F4-512C-4963-880A-7D1D367D5C11}.Release|x86.ActiveCfg = Release|Any CPU {94D7BBD0-33AE-4CAB-A398-585281C5459A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {94D7BBD0-33AE-4CAB-A398-585281C5459A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {94D7BBD0-33AE-4CAB-A398-585281C5459A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {94D7BBD0-33AE-4CAB-A398-585281C5459A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {94D7BBD0-33AE-4CAB-A398-585281C5459A}.Debug|x86.ActiveCfg = Debug|Any CPU {94D7BBD0-33AE-4CAB-A398-585281C5459A}.Release|Any CPU.ActiveCfg = Release|Any CPU {94D7BBD0-33AE-4CAB-A398-585281C5459A}.Release|Any CPU.Build.0 = Release|Any CPU - {94D7BBD0-33AE-4CAB-A398-585281C5459A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {94D7BBD0-33AE-4CAB-A398-585281C5459A}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {94D7BBD0-33AE-4CAB-A398-585281C5459A}.Release|x86.ActiveCfg = Release|Any CPU {C434AA5A-B324-4F08-AA11-028642B96881}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C434AA5A-B324-4F08-AA11-028642B96881}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C434AA5A-B324-4F08-AA11-028642B96881}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {C434AA5A-B324-4F08-AA11-028642B96881}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {C434AA5A-B324-4F08-AA11-028642B96881}.Debug|x86.ActiveCfg = Debug|Any CPU {C434AA5A-B324-4F08-AA11-028642B96881}.Release|Any CPU.ActiveCfg = Release|Any CPU {C434AA5A-B324-4F08-AA11-028642B96881}.Release|Any CPU.Build.0 = Release|Any CPU - {C434AA5A-B324-4F08-AA11-028642B96881}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {C434AA5A-B324-4F08-AA11-028642B96881}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {C434AA5A-B324-4F08-AA11-028642B96881}.Release|x86.ActiveCfg = Release|Any CPU {527A4A5D-DCF6-4483-95A3-5E3BA7FBF663}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {527A4A5D-DCF6-4483-95A3-5E3BA7FBF663}.Debug|Any CPU.Build.0 = Debug|Any CPU - {527A4A5D-DCF6-4483-95A3-5E3BA7FBF663}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {527A4A5D-DCF6-4483-95A3-5E3BA7FBF663}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {527A4A5D-DCF6-4483-95A3-5E3BA7FBF663}.Debug|x86.ActiveCfg = Debug|Any CPU {527A4A5D-DCF6-4483-95A3-5E3BA7FBF663}.Release|Any CPU.ActiveCfg = Release|Any CPU {527A4A5D-DCF6-4483-95A3-5E3BA7FBF663}.Release|Any CPU.Build.0 = Release|Any CPU - {527A4A5D-DCF6-4483-95A3-5E3BA7FBF663}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {527A4A5D-DCF6-4483-95A3-5E3BA7FBF663}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {527A4A5D-DCF6-4483-95A3-5E3BA7FBF663}.Release|x86.ActiveCfg = Release|Any CPU {8FDFBB7C-0F32-40CC-823A-81B1530BC8F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8FDFBB7C-0F32-40CC-823A-81B1530BC8F2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8FDFBB7C-0F32-40CC-823A-81B1530BC8F2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {8FDFBB7C-0F32-40CC-823A-81B1530BC8F2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {8FDFBB7C-0F32-40CC-823A-81B1530BC8F2}.Debug|x86.ActiveCfg = Debug|Any CPU {8FDFBB7C-0F32-40CC-823A-81B1530BC8F2}.Release|Any CPU.ActiveCfg = Release|Any CPU {8FDFBB7C-0F32-40CC-823A-81B1530BC8F2}.Release|Any CPU.Build.0 = Release|Any CPU - {8FDFBB7C-0F32-40CC-823A-81B1530BC8F2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {8FDFBB7C-0F32-40CC-823A-81B1530BC8F2}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {8FDFBB7C-0F32-40CC-823A-81B1530BC8F2}.Release|x86.ActiveCfg = Release|Any CPU {4B8B1878-571F-45FF-965B-FB5D2F988671}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4B8B1878-571F-45FF-965B-FB5D2F988671}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4B8B1878-571F-45FF-965B-FB5D2F988671}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {4B8B1878-571F-45FF-965B-FB5D2F988671}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {4B8B1878-571F-45FF-965B-FB5D2F988671}.Debug|x86.ActiveCfg = Debug|Any CPU {4B8B1878-571F-45FF-965B-FB5D2F988671}.Release|Any CPU.ActiveCfg = Release|Any CPU {4B8B1878-571F-45FF-965B-FB5D2F988671}.Release|Any CPU.Build.0 = Release|Any CPU - {4B8B1878-571F-45FF-965B-FB5D2F988671}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {4B8B1878-571F-45FF-965B-FB5D2F988671}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {4B8B1878-571F-45FF-965B-FB5D2F988671}.Release|x86.ActiveCfg = Release|Any CPU {F37D4936-BCBC-4CF4-AC9C-6FAAF954BF94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F37D4936-BCBC-4CF4-AC9C-6FAAF954BF94}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F37D4936-BCBC-4CF4-AC9C-6FAAF954BF94}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {F37D4936-BCBC-4CF4-AC9C-6FAAF954BF94}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {F37D4936-BCBC-4CF4-AC9C-6FAAF954BF94}.Debug|x86.ActiveCfg = Debug|Any CPU {F37D4936-BCBC-4CF4-AC9C-6FAAF954BF94}.Release|Any CPU.ActiveCfg = Release|Any CPU {F37D4936-BCBC-4CF4-AC9C-6FAAF954BF94}.Release|Any CPU.Build.0 = Release|Any CPU - {F37D4936-BCBC-4CF4-AC9C-6FAAF954BF94}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {F37D4936-BCBC-4CF4-AC9C-6FAAF954BF94}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {F37D4936-BCBC-4CF4-AC9C-6FAAF954BF94}.Release|x86.ActiveCfg = Release|Any CPU {D67CA1CC-594C-4A79-AD73-33A2D9052E89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D67CA1CC-594C-4A79-AD73-33A2D9052E89}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D67CA1CC-594C-4A79-AD73-33A2D9052E89}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {D67CA1CC-594C-4A79-AD73-33A2D9052E89}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {D67CA1CC-594C-4A79-AD73-33A2D9052E89}.Debug|x86.ActiveCfg = Debug|Any CPU {D67CA1CC-594C-4A79-AD73-33A2D9052E89}.Release|Any CPU.ActiveCfg = Release|Any CPU {D67CA1CC-594C-4A79-AD73-33A2D9052E89}.Release|Any CPU.Build.0 = Release|Any CPU - {D67CA1CC-594C-4A79-AD73-33A2D9052E89}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {D67CA1CC-594C-4A79-AD73-33A2D9052E89}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {D67CA1CC-594C-4A79-AD73-33A2D9052E89}.Release|x86.ActiveCfg = Release|Any CPU {8442DCB5-A97F-432C-8EF5-E0B540A6C8B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8442DCB5-A97F-432C-8EF5-E0B540A6C8B6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8442DCB5-A97F-432C-8EF5-E0B540A6C8B6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {8442DCB5-A97F-432C-8EF5-E0B540A6C8B6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {8442DCB5-A97F-432C-8EF5-E0B540A6C8B6}.Debug|x86.ActiveCfg = Debug|Any CPU {8442DCB5-A97F-432C-8EF5-E0B540A6C8B6}.Release|Any CPU.ActiveCfg = Release|Any CPU {8442DCB5-A97F-432C-8EF5-E0B540A6C8B6}.Release|Any CPU.Build.0 = Release|Any CPU - {8442DCB5-A97F-432C-8EF5-E0B540A6C8B6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {8442DCB5-A97F-432C-8EF5-E0B540A6C8B6}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {8442DCB5-A97F-432C-8EF5-E0B540A6C8B6}.Release|x86.ActiveCfg = Release|Any CPU {DEE27EC0-6A60-4508-BF6B-3B96C919AEF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {DEE27EC0-6A60-4508-BF6B-3B96C919AEF5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DEE27EC0-6A60-4508-BF6B-3B96C919AEF5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {DEE27EC0-6A60-4508-BF6B-3B96C919AEF5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {DEE27EC0-6A60-4508-BF6B-3B96C919AEF5}.Debug|x86.ActiveCfg = Debug|Any CPU {DEE27EC0-6A60-4508-BF6B-3B96C919AEF5}.Release|Any CPU.ActiveCfg = Release|Any CPU {DEE27EC0-6A60-4508-BF6B-3B96C919AEF5}.Release|Any CPU.Build.0 = Release|Any CPU - {DEE27EC0-6A60-4508-BF6B-3B96C919AEF5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {DEE27EC0-6A60-4508-BF6B-3B96C919AEF5}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {DEE27EC0-6A60-4508-BF6B-3B96C919AEF5}.Release|x86.ActiveCfg = Release|Any CPU {2E959617-E541-4985-8582-4E6733F0AEF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2E959617-E541-4985-8582-4E6733F0AEF7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2E959617-E541-4985-8582-4E6733F0AEF7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {2E959617-E541-4985-8582-4E6733F0AEF7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {2E959617-E541-4985-8582-4E6733F0AEF7}.Debug|x86.ActiveCfg = Debug|Any CPU {2E959617-E541-4985-8582-4E6733F0AEF7}.Release|Any CPU.ActiveCfg = Release|Any CPU {2E959617-E541-4985-8582-4E6733F0AEF7}.Release|Any CPU.Build.0 = Release|Any CPU - {2E959617-E541-4985-8582-4E6733F0AEF7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {2E959617-E541-4985-8582-4E6733F0AEF7}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {2E959617-E541-4985-8582-4E6733F0AEF7}.Release|x86.ActiveCfg = Release|Any CPU {BDE229A2-4F54-4463-9FFA-81ACBEE4E890}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BDE229A2-4F54-4463-9FFA-81ACBEE4E890}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BDE229A2-4F54-4463-9FFA-81ACBEE4E890}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {BDE229A2-4F54-4463-9FFA-81ACBEE4E890}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {BDE229A2-4F54-4463-9FFA-81ACBEE4E890}.Debug|x86.ActiveCfg = Debug|Any CPU {BDE229A2-4F54-4463-9FFA-81ACBEE4E890}.Release|Any CPU.ActiveCfg = Release|Any CPU {BDE229A2-4F54-4463-9FFA-81ACBEE4E890}.Release|Any CPU.Build.0 = Release|Any CPU - {BDE229A2-4F54-4463-9FFA-81ACBEE4E890}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {BDE229A2-4F54-4463-9FFA-81ACBEE4E890}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {BDE229A2-4F54-4463-9FFA-81ACBEE4E890}.Release|x86.ActiveCfg = Release|Any CPU {E8BF3F9B-EAA4-48E9-AC31-59DE955B60EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E8BF3F9B-EAA4-48E9-AC31-59DE955B60EE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E8BF3F9B-EAA4-48E9-AC31-59DE955B60EE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {E8BF3F9B-EAA4-48E9-AC31-59DE955B60EE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {E8BF3F9B-EAA4-48E9-AC31-59DE955B60EE}.Debug|x86.ActiveCfg = Debug|Any CPU {E8BF3F9B-EAA4-48E9-AC31-59DE955B60EE}.Release|Any CPU.ActiveCfg = Release|Any CPU {E8BF3F9B-EAA4-48E9-AC31-59DE955B60EE}.Release|Any CPU.Build.0 = Release|Any CPU - {E8BF3F9B-EAA4-48E9-AC31-59DE955B60EE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {E8BF3F9B-EAA4-48E9-AC31-59DE955B60EE}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {E8BF3F9B-EAA4-48E9-AC31-59DE955B60EE}.Release|x86.ActiveCfg = Release|Any CPU {0F56F737-7B9D-4546-823B-BCD41565E0DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0F56F737-7B9D-4546-823B-BCD41565E0DE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0F56F737-7B9D-4546-823B-BCD41565E0DE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {0F56F737-7B9D-4546-823B-BCD41565E0DE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {0F56F737-7B9D-4546-823B-BCD41565E0DE}.Debug|x86.ActiveCfg = Debug|Any CPU - {0F56F737-7B9D-4546-823B-BCD41565E0DE}.Debug|x86.Build.0 = Debug|Any CPU {0F56F737-7B9D-4546-823B-BCD41565E0DE}.Release|Any CPU.ActiveCfg = Release|Any CPU {0F56F737-7B9D-4546-823B-BCD41565E0DE}.Release|Any CPU.Build.0 = Release|Any CPU - {0F56F737-7B9D-4546-823B-BCD41565E0DE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {0F56F737-7B9D-4546-823B-BCD41565E0DE}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {0F56F737-7B9D-4546-823B-BCD41565E0DE}.Release|x86.ActiveCfg = Release|Any CPU - {0F56F737-7B9D-4546-823B-BCD41565E0DE}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution + {80954E2B-831D-431A-B1AA-0DE9CEFD1680} = {5483408F-F69F-4C69-91A5-1168808F12E0} + {5BB4C396-014C-4E89-B7CB-B9113F1A55FE} = {5483408F-F69F-4C69-91A5-1168808F12E0} + {B38C64AF-4EFB-4C37-9C3B-33903B00824C} = {5483408F-F69F-4C69-91A5-1168808F12E0} + {214B0F61-75F7-4295-AED9-3D7DB20D8054} = {CE88569C-DAB3-4BDA-8064-B54C0104683D} + {A769E993-9F23-41EC-9453-79A171565D8B} = {CE88569C-DAB3-4BDA-8064-B54C0104683D} + {464D872D-C9CA-4C2F-9FEC-7AC1FE071845} = {CE88569C-DAB3-4BDA-8064-B54C0104683D} {4DBFB7F4-512C-4963-880A-7D1D367D5C11} = {80954E2B-831D-431A-B1AA-0DE9CEFD1680} {94D7BBD0-33AE-4CAB-A398-585281C5459A} = {214B0F61-75F7-4295-AED9-3D7DB20D8054} {C434AA5A-B324-4F08-AA11-028642B96881} = {80954E2B-831D-431A-B1AA-0DE9CEFD1680} @@ -262,12 +172,6 @@ Global {DEE27EC0-6A60-4508-BF6B-3B96C919AEF5} = {A769E993-9F23-41EC-9453-79A171565D8B} {2E959617-E541-4985-8582-4E6733F0AEF7} = {5BB4C396-014C-4E89-B7CB-B9113F1A55FE} {BDE229A2-4F54-4463-9FFA-81ACBEE4E890} = {464D872D-C9CA-4C2F-9FEC-7AC1FE071845} - {80954E2B-831D-431A-B1AA-0DE9CEFD1680} = {5483408F-F69F-4C69-91A5-1168808F12E0} - {5BB4C396-014C-4E89-B7CB-B9113F1A55FE} = {5483408F-F69F-4C69-91A5-1168808F12E0} - {B38C64AF-4EFB-4C37-9C3B-33903B00824C} = {5483408F-F69F-4C69-91A5-1168808F12E0} {0F56F737-7B9D-4546-823B-BCD41565E0DE} = {B38C64AF-4EFB-4C37-9C3B-33903B00824C} - {214B0F61-75F7-4295-AED9-3D7DB20D8054} = {CE88569C-DAB3-4BDA-8064-B54C0104683D} - {A769E993-9F23-41EC-9453-79A171565D8B} = {CE88569C-DAB3-4BDA-8064-B54C0104683D} - {464D872D-C9CA-4C2F-9FEC-7AC1FE071845} = {CE88569C-DAB3-4BDA-8064-B54C0104683D} EndGlobalSection EndGlobal diff --git a/src/OrleansVSTools/OrleansVSTools/Guids.cs b/src/OrleansVSTools/OrleansVSTools/Guids.cs index 870bf2a32d..5b033d0af5 100644 --- a/src/OrleansVSTools/OrleansVSTools/Guids.cs +++ b/src/OrleansVSTools/OrleansVSTools/Guids.cs @@ -29,9 +29,9 @@ namespace OrleansVSTools { static class GuidList { - public const string guidOrleansVSTools11PkgString = "462db41f-31a4-48f0-834c-1bdcc0578511"; - public const string guidOrleansVSTools11CmdSetString = "e52a46d8-332c-4522-8ebc-ebc745a1e3ef"; + public const string guidOrleansVSToolsPkgString = "462db41f-31a4-48f0-834c-1bdcc0578511"; + public const string guidOrleansVSToolsCmdSetString = "e52a46d8-332c-4522-8ebc-ebc745a1e3ef"; - public static readonly Guid guidOrleansVSTools11CmdSet = new Guid(guidOrleansVSTools11CmdSetString); + public static readonly Guid guidOrleansVSToolsCmdSet = new Guid(guidOrleansVSToolsCmdSetString); }; } \ No newline at end of file diff --git a/src/OrleansVSTools/OrleansVSTools/OrleansVSTools.csproj b/src/OrleansVSTools/OrleansVSTools/OrleansVSTools.csproj index 3587f71d2e..6e5c9feb7b 100644 --- a/src/OrleansVSTools/OrleansVSTools/OrleansVSTools.csproj +++ b/src/OrleansVSTools/OrleansVSTools/OrleansVSTools.csproj @@ -4,10 +4,6 @@ 12.0 11.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - @@ -131,6 +127,10 @@ + + + Properties\GlobalAssemblyInfo.cs + diff --git a/src/OrleansVSTools/OrleansVSTools/OrleansVSToolsPackage.cs b/src/OrleansVSTools/OrleansVSTools/OrleansVSToolsPackage.cs index 86389d5cb9..b41e33f378 100644 --- a/src/OrleansVSTools/OrleansVSTools/OrleansVSToolsPackage.cs +++ b/src/OrleansVSTools/OrleansVSTools/OrleansVSToolsPackage.cs @@ -44,7 +44,7 @@ namespace OrleansVSTools // This attribute is used to register the information needed to show this package // in the Help/About dialog of Visual Studio. [InstalledProductRegistration("#110", "#112", "1.0", IconResourceID = 400)] - [Guid(GuidList.guidOrleansVSTools11PkgString)] + [Guid(GuidList.guidOrleansVSToolsPkgString)] public sealed class OrleansVSToolsPackage : Package { /// diff --git a/src/OrleansVSTools/OrleansVSTools/Properties/AssemblyInfo.cs b/src/OrleansVSTools/OrleansVSTools/Properties/AssemblyInfo.cs index 520867f882..65404ba7dd 100644 --- a/src/OrleansVSTools/OrleansVSTools/Properties/AssemblyInfo.cs +++ b/src/OrleansVSTools/OrleansVSTools/Properties/AssemblyInfo.cs @@ -30,30 +30,8 @@ The above copyright notice and this permission notice shall be included in all c // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("OrleansVSTools11")] +[assembly: AssemblyTitle("OrleansVSTools")] [assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Cloud Computing Futures")] -[assembly: AssemblyProduct("OrleansVSTools11")] -[assembly: AssemblyCopyright("")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] [assembly: ComVisible(false)] [assembly: CLSCompliant(false)] [assembly: NeutralResourcesLanguage("en-US")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Revision and Build Numbers -// by using the '*' as shown below: - -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] - -[assembly: InternalsVisibleTo("OrleansVSTools11_IntegrationTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100eb81539dc2728946d4860bad0fbc91ea23d7a835e00547aa4e9a7abf185535b564d29dbe77915b779951fef2f4b1ab39cc3a246cf572c7b217b5c892835a687eb22638183d66930039ff9fa6e7e71cb880f854fb76b884dfc905bf1f3c623abad7d4732c1ce62efff937155e352170831239acbe103a41ed363a90001d3108ca")] - diff --git a/src/OrleansVSTools/OrleansVSTools/VSPackage.resx b/src/OrleansVSTools/OrleansVSTools/VSPackage.resx index 0ed66e3dd8..ac08873074 100644 --- a/src/OrleansVSTools/OrleansVSTools/VSPackage.resx +++ b/src/OrleansVSTools/OrleansVSTools/VSPackage.resx @@ -129,7 +129,7 @@ - OrleansVSTools11 + OrleansVSTools Orleans Tools for Visual Studio 2012 diff --git a/src/OrleansVSTools/OrleansVSTools/source.extension.vsixmanifest b/src/OrleansVSTools/OrleansVSTools/source.extension.vsixmanifest index 770d6e0cbb..2851b61191 100644 --- a/src/OrleansVSTools/OrleansVSTools/source.extension.vsixmanifest +++ b/src/OrleansVSTools/OrleansVSTools/source.extension.vsixmanifest @@ -1,14 +1,14 @@ - - OrleansVSTools11 + + OrleansVSTools Orleans Tools for Visual Studio 2012, 2013, 2015 - http://toolbox/orleans + htts://github.com/dotnet/orleans/ License.txt Orleans.ico orleans-poster.jpg - MS Internal Only,Orleans,Cloud Computing,Actor Model,Actors,Distributed Systems + Orleans,Cloud-Computing,Actor-Model,Actors,Distributed-Systems,C#,VB,F# diff --git a/src/OrleansVSTools/VSItemTemplateGrainImplementation/VSItemTemplateGrainImplementation.csproj b/src/OrleansVSTools/VSItemTemplateGrainImplementation/VSItemTemplateGrainImplementation.csproj index 02d620f6d8..f907d3c952 100644 --- a/src/OrleansVSTools/VSItemTemplateGrainImplementation/VSItemTemplateGrainImplementation.csproj +++ b/src/OrleansVSTools/VSItemTemplateGrainImplementation/VSItemTemplateGrainImplementation.csproj @@ -22,10 +22,6 @@ false false false - - - - 12.0 diff --git a/src/OrleansVSTools/VSItemTemplateGrainImplementationFSharp/VSItemTemplateGrainImplementationFSharp.fsproj b/src/OrleansVSTools/VSItemTemplateGrainImplementationFSharp/VSItemTemplateGrainImplementationFSharp.fsproj index fcdbba3582..bd1daf6b1a 100644 --- a/src/OrleansVSTools/VSItemTemplateGrainImplementationFSharp/VSItemTemplateGrainImplementationFSharp.fsproj +++ b/src/OrleansVSTools/VSItemTemplateGrainImplementationFSharp/VSItemTemplateGrainImplementationFSharp.fsproj @@ -23,16 +23,8 @@ false false false - - - - 11.0 - - - - - 4.0 + 4.3.0.0 true @@ -60,7 +52,19 @@ 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - + + + + $(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets + + + + + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets + + + + @@ -69,13 +73,13 @@ + + True + False - - True - diff --git a/src/OrleansVSTools/VSItemTemplateGrainImplementationVB/VSItemTemplateGrainImplementationVB.vbproj b/src/OrleansVSTools/VSItemTemplateGrainImplementationVB/VSItemTemplateGrainImplementationVB.vbproj index 94243dd7a1..cf394cb2e2 100644 --- a/src/OrleansVSTools/VSItemTemplateGrainImplementationVB/VSItemTemplateGrainImplementationVB.vbproj +++ b/src/OrleansVSTools/VSItemTemplateGrainImplementationVB/VSItemTemplateGrainImplementationVB.vbproj @@ -4,15 +4,6 @@ 12.0 11.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - - - - - 4.0 diff --git a/src/OrleansVSTools/VSItemTemplateGrainInterface/VSItemTemplateGrainInterface.csproj b/src/OrleansVSTools/VSItemTemplateGrainInterface/VSItemTemplateGrainInterface.csproj index c4d6bc9226..5fa3aca24e 100644 --- a/src/OrleansVSTools/VSItemTemplateGrainInterface/VSItemTemplateGrainInterface.csproj +++ b/src/OrleansVSTools/VSItemTemplateGrainInterface/VSItemTemplateGrainInterface.csproj @@ -22,10 +22,6 @@ false false false - - - - 12.0 diff --git a/src/OrleansVSTools/VSItemTemplateGrainInterfaceVB/VSItemTemplateGrainInterfaceVB.vbproj b/src/OrleansVSTools/VSItemTemplateGrainInterfaceVB/VSItemTemplateGrainInterfaceVB.vbproj index 493da9f3dc..0d71df2a46 100644 --- a/src/OrleansVSTools/VSItemTemplateGrainInterfaceVB/VSItemTemplateGrainInterfaceVB.vbproj +++ b/src/OrleansVSTools/VSItemTemplateGrainInterfaceVB/VSItemTemplateGrainInterfaceVB.vbproj @@ -4,15 +4,6 @@ 12.0 11.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - - - - - 4.0 diff --git a/src/OrleansVSTools/VSItemTemplatePersistedGrain/Properties/AssemblyInfo.cs b/src/OrleansVSTools/VSItemTemplatePersistedGrain/Properties/AssemblyInfo.cs deleted file mode 100644 index f0b93d0e16..0000000000 --- a/src/OrleansVSTools/VSItemTemplatePersistedGrain/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,59 +0,0 @@ -/* -Project Orleans Cloud Service SDK ver. 1.0 - -Copyright (c) Microsoft Corporation - -All rights reserved. - -MIT License - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and -associated documentation files (the ""Software""), to deal in the Software without restriction, -including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, -and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO -THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS -OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -*/ - -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("VSItemTemplatePersistedGrain")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("VSItemTemplatePersistedGrain")] -[assembly: AssemblyCopyright("Copyright © 2014")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("f84db70a-2b38-4c69-8798-c60989e26e07")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/OrleansVSTools/VSItemTemplatePersistedGrain/VSItemTemplatePersistedGrain.csproj b/src/OrleansVSTools/VSItemTemplatePersistedGrain/VSItemTemplatePersistedGrain.csproj index e9744aace5..902e603120 100644 --- a/src/OrleansVSTools/VSItemTemplatePersistedGrain/VSItemTemplatePersistedGrain.csproj +++ b/src/OrleansVSTools/VSItemTemplatePersistedGrain/VSItemTemplatePersistedGrain.csproj @@ -4,10 +4,6 @@ 12.0 11.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - @@ -58,9 +54,6 @@ - - - diff --git a/src/OrleansVSTools/VSItemTemplatePersistedGrainVB/VSItemTemplatePersistedGrainVB.vbproj b/src/OrleansVSTools/VSItemTemplatePersistedGrainVB/VSItemTemplatePersistedGrainVB.vbproj index 549d60a288..995a7c2a2f 100644 --- a/src/OrleansVSTools/VSItemTemplatePersistedGrainVB/VSItemTemplatePersistedGrainVB.vbproj +++ b/src/OrleansVSTools/VSItemTemplatePersistedGrainVB/VSItemTemplatePersistedGrainVB.vbproj @@ -4,15 +4,6 @@ 12.0 11.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - - - - - 4.0 diff --git a/src/OrleansVSTools/VSProjectSiloHost/ProjectTemplate.csproj b/src/OrleansVSTools/VSProjectSiloHost/ProjectTemplate.csproj index 6e4e8971fa..1527eee193 100644 --- a/src/OrleansVSTools/VSProjectSiloHost/ProjectTemplate.csproj +++ b/src/OrleansVSTools/VSProjectSiloHost/ProjectTemplate.csproj @@ -40,14 +40,6 @@ - - $(OrleansSDK)\Binaries\OrleansClient\Orleans.dll - False - - - $(OrleansSDK)\Binaries\OrleansServer\OrleansRuntime.dll - False - diff --git a/src/OrleansVSTools/VSProjectSiloHost/VSProjectSiloHost.csproj b/src/OrleansVSTools/VSProjectSiloHost/VSProjectSiloHost.csproj index bf9e79722e..f0df7385a3 100644 --- a/src/OrleansVSTools/VSProjectSiloHost/VSProjectSiloHost.csproj +++ b/src/OrleansVSTools/VSProjectSiloHost/VSProjectSiloHost.csproj @@ -4,10 +4,6 @@ 12.0 11.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - @@ -62,24 +58,20 @@ - - - - - Designer - + + + + - - diff --git a/src/OrleansVSTools/VSProjectSiloHost/VSProjectSiloHost.vstemplate b/src/OrleansVSTools/VSProjectSiloHost/VSProjectSiloHost.vstemplate index c8de7d06e1..9528d84238 100644 --- a/src/OrleansVSTools/VSProjectSiloHost/VSProjectSiloHost.vstemplate +++ b/src/OrleansVSTools/VSProjectSiloHost/VSProjectSiloHost.vstemplate @@ -7,7 +7,7 @@ CSharp 4.5 1000 - ba427b09-614a-41ef-ac5e-49c47909f209 + Orleans.Templates.Project.SiloHost.DevTest true SiloHost true @@ -20,6 +20,7 @@ DevTestServerConfiguration.xml OrleansHostWrapper.cs Program.cs + packages.config.txt \ No newline at end of file diff --git a/src/OrleansVSTools/VSProjectSiloHost/packages.config.txt b/src/OrleansVSTools/VSProjectSiloHost/packages.config.txt new file mode 100644 index 0000000000..59f443252e --- /dev/null +++ b/src/OrleansVSTools/VSProjectSiloHost/packages.config.txt @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/OrleansVSTools/VSProjectTemplateGrainImplementation/ProjectTemplate.csproj b/src/OrleansVSTools/VSProjectTemplateGrainImplementation/ProjectTemplate.csproj index 36af3b26fe..60a385fdf1 100644 --- a/src/OrleansVSTools/VSProjectTemplateGrainImplementation/ProjectTemplate.csproj +++ b/src/OrleansVSTools/VSProjectTemplateGrainImplementation/ProjectTemplate.csproj @@ -1,6 +1,7 @@  - + + Debug AnyCPU 8.0.30703 @@ -13,7 +14,7 @@ v4.5 512 - + Program $(OrleansSDK)\LocalSilo\OrleansHost.exe $(OrleansSDK)\LocalSilo @@ -36,28 +37,25 @@ 4 - + + ..\packages\Microsoft.Orleans.Core.1.0.5\lib\net45\Orleans.dll + + - - $(OrleansSDK)\Binaries\OrleansClient\Orleans.dll - False - - + + + - - Server - - if exist "$(OrleansSDK)\LocalSilo" ( @@ -66,16 +64,14 @@ copy /y *.dll "$(OrleansSDK)\LocalSilo\Applications\$(RootNamespace)\" copy /y *.pdb "$(OrleansSDK)\LocalSilo\Applications\$(RootNamespace)\" ) - if exist "$(OrleansSDK)\Binaries" ( - if not exist "$(OrleansSDK)\Binaries\Applications" (md "$(OrleansSDK)\Binaries\Applications") - if not exist "$(OrleansSDK)\Binaries\Applications\$(RootNamespace)" (md "$(OrleansSDK)\Binaries\Applications\$(RootNamespace)") - copy /y *.dll "$(OrleansSDK)\Binaries\Applications\$(RootNamespace)\" - copy /y *.pdb "$(OrleansSDK)\Binaries\Applications\$(RootNamespace)\" - ) - + + + This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + diff --git a/src/OrleansVSTools/VSProjectTemplateGrainImplementation/Properties/Orleans.codegen.cs b/src/OrleansVSTools/VSProjectTemplateGrainImplementation/Properties/Orleans.codegen.cs deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/src/OrleansVSTools/VSProjectTemplateGrainImplementation/VSProjectTemplateGrainImplementation.csproj b/src/OrleansVSTools/VSProjectTemplateGrainImplementation/VSProjectTemplateGrainImplementation.csproj index 4fe2a1c457..cf6bf37c13 100644 --- a/src/OrleansVSTools/VSProjectTemplateGrainImplementation/VSProjectTemplateGrainImplementation.csproj +++ b/src/OrleansVSTools/VSProjectTemplateGrainImplementation/VSProjectTemplateGrainImplementation.csproj @@ -1,6 +1,5 @@  - Debug @@ -23,14 +22,6 @@ false false false - - - - - - - - 12.0 publish\ @@ -75,9 +66,6 @@ False - - ..\packages\Microsoft.Orleans.Templates.Grains.1.0.0\lib\net45\Orleans.dll - @@ -85,11 +73,9 @@ - - - + @@ -100,26 +86,6 @@ - - - False - Microsoft .NET Framework 4.5 %28x86 and x64%29 - true - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - false - - - - - 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) @@ -131,11 +97,8 @@ This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - + \ No newline at end of file diff --git a/src/OrleansVSTools/VSProjectTemplateGrainImplementationFSharp/VSProjectTemplateGrainImplementation.vstemplate b/src/OrleansVSTools/VSProjectTemplateGrainImplementationFSharp/VSProjectTemplateGrainImplementation.vstemplate index 6329ea7e70..c4f03c38d8 100644 --- a/src/OrleansVSTools/VSProjectTemplateGrainImplementationFSharp/VSProjectTemplateGrainImplementation.vstemplate +++ b/src/OrleansVSTools/VSProjectTemplateGrainImplementationFSharp/VSProjectTemplateGrainImplementation.vstemplate @@ -11,7 +11,7 @@ Orleans false true - GrainCollection + Grain1 true diff --git a/src/OrleansVSTools/VSProjectTemplateGrainImplementationFSharp/VSProjectTemplateGrainImplementationFSharp.fsproj b/src/OrleansVSTools/VSProjectTemplateGrainImplementationFSharp/VSProjectTemplateGrainImplementationFSharp.fsproj index e9cc05ee28..3a1b098a99 100644 --- a/src/OrleansVSTools/VSProjectTemplateGrainImplementationFSharp/VSProjectTemplateGrainImplementationFSharp.fsproj +++ b/src/OrleansVSTools/VSProjectTemplateGrainImplementationFSharp/VSProjectTemplateGrainImplementationFSharp.fsproj @@ -23,16 +23,7 @@ false false false - - - - 11.0 - - - - - 4.0 4.3.0.0 diff --git a/src/OrleansVSTools/VSProjectTemplateGrainImplementationVB/ProjectTemplate.vbproj b/src/OrleansVSTools/VSProjectTemplateGrainImplementationVB/ProjectTemplate.vbproj index 161d8e134f..ccfb874a19 100644 --- a/src/OrleansVSTools/VSProjectTemplateGrainImplementationVB/ProjectTemplate.vbproj +++ b/src/OrleansVSTools/VSProjectTemplateGrainImplementationVB/ProjectTemplate.vbproj @@ -1,5 +1,6 @@  + Debug AnyCPU @@ -12,7 +13,7 @@ v$targetframeworkversion$ - + Program $(OrleansSDK)\LocalSilo\OrleansHost.exe $(OrleansSDK)\LocalSilo @@ -46,8 +47,8 @@ - $(OrleansSDK)\Binaries\OrleansClient\Orleans.dll False + ..\packages\Microsoft.Orleans.Core.1.0.5\lib\net45\Orleans.dll @@ -105,10 +106,6 @@ - - Server - - if exist "$(OrleansSDK)\LocalSilo" ( @@ -117,21 +114,14 @@ copy /y *.dll "$(OrleansSDK)\LocalSilo\Applications\$(RootNamespace)\" copy /y *.pdb "$(OrleansSDK)\LocalSilo\Applications\$(RootNamespace)\" ) - if exist "$(OrleansSDK)\Binaries" ( - if not exist "$(OrleansSDK)\Binaries\Applications" (md "$(OrleansSDK)\Binaries\Applications") - if not exist "$(OrleansSDK)\Binaries\Applications\$(RootNamespace)" (md "$(OrleansSDK)\Binaries\Applications\$(RootNamespace)") - copy /y *.dll "$(OrleansSDK)\Binaries\Applications\$(RootNamespace)\" - copy /y *.pdb "$(OrleansSDK)\Binaries\Applications\$(RootNamespace)\" - ) - - - - + + diff --git a/src/OrleansVSTools/VSProjectTemplateGrainImplementationVB/VSProjectTemplateGrainImplementationVB.vbproj b/src/OrleansVSTools/VSProjectTemplateGrainImplementationVB/VSProjectTemplateGrainImplementationVB.vbproj index 7e77e8ab93..247b8c5af9 100644 --- a/src/OrleansVSTools/VSProjectTemplateGrainImplementationVB/VSProjectTemplateGrainImplementationVB.vbproj +++ b/src/OrleansVSTools/VSProjectTemplateGrainImplementationVB/VSProjectTemplateGrainImplementationVB.vbproj @@ -4,16 +4,7 @@ 12.0 11.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - - - - - 4.0 diff --git a/src/OrleansVSTools/VSProjectTemplateGrainImplementationVB/VSProjectTemplateGrainImplementationVB.vstemplate b/src/OrleansVSTools/VSProjectTemplateGrainImplementationVB/VSProjectTemplateGrainImplementationVB.vstemplate index ba2e6ba954..2ea47d5cfa 100644 --- a/src/OrleansVSTools/VSProjectTemplateGrainImplementationVB/VSProjectTemplateGrainImplementationVB.vstemplate +++ b/src/OrleansVSTools/VSProjectTemplateGrainImplementationVB/VSProjectTemplateGrainImplementationVB.vstemplate @@ -8,7 +8,7 @@ 1000 1 true - GrainCollection + Grain1 true 4.5 diff --git a/src/OrleansVSTools/VSProjectTemplateGrainInterface/ProjectTemplate.csproj b/src/OrleansVSTools/VSProjectTemplateGrainInterface/ProjectTemplate.csproj index ec7fe7367a..f0dcb7911b 100644 --- a/src/OrleansVSTools/VSProjectTemplateGrainInterface/ProjectTemplate.csproj +++ b/src/OrleansVSTools/VSProjectTemplateGrainInterface/ProjectTemplate.csproj @@ -1,6 +1,7 @@  - + + Debug AnyCPU 8.0.30703 @@ -31,37 +32,32 @@ 4 - + + ..\packages\Microsoft.Orleans.Core.1.0.5\lib\net45\Orleans.dll + + - - $(OrleansSDK)\Binaries\OrleansClient\Orleans.dll - False - + + + - - Client - - - - - - - - + + diff --git a/src/OrleansVSTools/VSProjectTemplateGrainInterface/Properties/Orleans.codegen.cs b/src/OrleansVSTools/VSProjectTemplateGrainInterface/Properties/Orleans.codegen.cs deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/src/OrleansVSTools/VSProjectTemplateGrainInterface/VSProjectTemplateGrainInterface.csproj b/src/OrleansVSTools/VSProjectTemplateGrainInterface/VSProjectTemplateGrainInterface.csproj index 7806d21c83..d2698dc516 100644 --- a/src/OrleansVSTools/VSProjectTemplateGrainInterface/VSProjectTemplateGrainInterface.csproj +++ b/src/OrleansVSTools/VSProjectTemplateGrainInterface/VSProjectTemplateGrainInterface.csproj @@ -3,8 +3,6 @@ true - - Debug @@ -27,14 +25,6 @@ false false false - - - - - - - - 12.0 publish\ @@ -85,41 +75,18 @@ - - - Designer - + + + + - - - - - - - - False - Microsoft .NET Framework 4.5 %28x86 and x64%29 - true - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - false - - - 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) @@ -131,14 +98,8 @@ This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - - + + diff --git a/src/OrleansVSTools/VSProjectTemplateGrainInterfaceVB/VSProjectTemplateGrainInterfaceVB.vbproj b/src/OrleansVSTools/VSProjectTemplateGrainInterfaceVB/VSProjectTemplateGrainInterfaceVB.vbproj index 028529f0d5..7e9b544287 100644 --- a/src/OrleansVSTools/VSProjectTemplateGrainInterfaceVB/VSProjectTemplateGrainInterfaceVB.vbproj +++ b/src/OrleansVSTools/VSProjectTemplateGrainInterfaceVB/VSProjectTemplateGrainInterfaceVB.vbproj @@ -4,16 +4,6 @@ 12.0 11.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - - - - - - 4.0 diff --git a/src/OrleansVSTools/VSProjectTemplateGrainInterfaceVB/VSProjectTemplateGrainInterfaceVB.vstemplate b/src/OrleansVSTools/VSProjectTemplateGrainInterfaceVB/VSProjectTemplateGrainInterfaceVB.vstemplate index 54ef0856f0..aa752656df 100644 --- a/src/OrleansVSTools/VSProjectTemplateGrainInterfaceVB/VSProjectTemplateGrainInterfaceVB.vstemplate +++ b/src/OrleansVSTools/VSProjectTemplateGrainInterfaceVB/VSProjectTemplateGrainInterfaceVB.vstemplate @@ -8,7 +8,7 @@ 1000 1 true - MyGrainInterfaces + IGrain1 true 4.5 diff --git a/src/SDK/OrleansVSTools.vsix b/src/SDK/OrleansVSTools.vsix index 507420fbaa..1913ac550c 100644 Binary files a/src/SDK/OrleansVSTools.vsix and b/src/SDK/OrleansVSTools.vsix differ