Skip to content

Commit dbb7059

Browse files
multiarcmultiarc
committed
Fallback to netstandard2.0 in Visual Studio and allow any target for other IDEs and dotnet command line.
Signed-off-by: Aliaksandr Kukrash <multiarc@gmail.com>
1 parent bdcf195 commit dbb7059

39 files changed

+545
-37
lines changed

‎Schema.NET.sln‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Data", "Data", "{A208CE34-D
127127
Data\schemaorg-all-https.jsonld = Data\schemaorg-all-https.jsonld
128128
EndProjectSection
129129
EndProject
130+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Schema.NET.Tool.VisualStudio", "Tools\Schema.NET.Tool.VisualStudio\Schema.NET.Tool.VisualStudio.csproj", "{647EABEE-FB8C-465B-A18E-1B300F6E4615}"
131+
EndProject
130132
Global
131133
GlobalSection(SolutionConfigurationPlatforms) = preSolution
132134
Debug|Any CPU = Debug|Any CPU
@@ -157,6 +159,10 @@ Global
157159
{8923F9E2-4BB8-45F9-9A85-863F381B46EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
158160
{8923F9E2-4BB8-45F9-9A85-863F381B46EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
159161
{8923F9E2-4BB8-45F9-9A85-863F381B46EE}.Release|Any CPU.Build.0 = Release|Any CPU
162+
{647EABEE-FB8C-465B-A18E-1B300F6E4615}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
163+
{647EABEE-FB8C-465B-A18E-1B300F6E4615}.Debug|Any CPU.Build.0 = Debug|Any CPU
164+
{647EABEE-FB8C-465B-A18E-1B300F6E4615}.Release|Any CPU.ActiveCfg = Release|Any CPU
165+
{647EABEE-FB8C-465B-A18E-1B300F6E4615}.Release|Any CPU.Build.0 = Release|Any CPU
160166
EndGlobalSection
161167
GlobalSection(SolutionProperties) = preSolution
162168
HideSolutionNode = FALSE
@@ -173,6 +179,7 @@ Global
173179
{4EDF33FF-4532-4328-A158-D026C66537BA} = {719809C2-A551-4C4A-9EFD-B10FB5E35BC0}
174180
{AF228B8A-7290-4E26-8506-934C290C6AE3} = {719809C2-A551-4C4A-9EFD-B10FB5E35BC0}
175181
{8923F9E2-4BB8-45F9-9A85-863F381B46EE} = {1D81D082-9C25-4D4E-890E-9CD173532307}
182+
{647EABEE-FB8C-465B-A18E-1B300F6E4615} = {1D81D082-9C25-4D4E-890E-9CD173532307}
176183
EndGlobalSection
177184
GlobalSection(ExtensibilityGlobals) = postSolution
178185
SolutionGuid = {73F36209-F8D6-4066-8951-D97729F773CF}

‎Source/Schema.NET.Pending/Schema.NET.Pending.csproj‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,14 @@
2929
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.5.0" />
3030
</ItemGroup>
3131

32-
<ItemGroup Label="Package References">
32+
<ItemGroup Label="Package References" Condition="'$(BuildingInsideVisualStudio)' != 'true'">
3333
<ProjectReference Include="../../Tools/Schema.NET.Tool/Schema.NET.Tool.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
3434
</ItemGroup>
3535

36+
<ItemGroup Label="Package References" Condition="'$(BuildingInsideVisualStudio)' == 'true'">
37+
<ProjectReference Include="../../Tools/Schema.NET.Tool.VisualStudio/Schema.NET.Tool.VisualStudio.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
38+
</ItemGroup>
39+
3640
<ItemGroup Label="Common Code">
3741
<Compile Include="../Common/*.*" />
3842
</ItemGroup>

‎Source/Schema.NET/Schema.NET.csproj‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,14 @@
2828
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.5.0" />
2929
</ItemGroup>
3030

31-
<ItemGroup Label="Package References">
31+
<ItemGroup Label="Package References" Condition="'$(BuildingInsideVisualStudio)' != 'true'">
3232
<ProjectReference Include="../../Tools/Schema.NET.Tool/Schema.NET.Tool.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
3333
</ItemGroup>
3434

35+
<ItemGroup Label="Package References" Condition="'$(BuildingInsideVisualStudio)' == 'true'">
36+
<ProjectReference Include="../../Tools/Schema.NET.Tool.VisualStudio/Schema.NET.Tool.VisualStudio.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
37+
</ItemGroup>
38+
3539
<ItemGroup Label="Common Code">
3640
<Compile Include="../Common/*.*" />
3741
</ItemGroup>

‎Tools/Schema.NET.Tool/CollectionExtensions.cs‎ renamed to ‎Tools/Schema.NET.Tool.Shared/CollectionExtensions.cs‎

File renamed without changes.

‎Tools/Schema.NET.Tool/Constants/LayerName.cs‎ renamed to ‎Tools/Schema.NET.Tool.Shared/Constants/LayerName.cs‎

File renamed without changes.

‎Tools/Schema.NET.Tool/CustomOverrides/AddNumberTypeToMediaObjectHeightAndWidth.cs‎ renamed to ‎Tools/Schema.NET.Tool.Shared/CustomOverrides/AddNumberTypeToMediaObjectHeightAndWidth.cs‎

File renamed without changes.

‎Tools/Schema.NET.Tool/CustomOverrides/AddQueryInputPropertyToSearchAction.cs‎ renamed to ‎Tools/Schema.NET.Tool.Shared/CustomOverrides/AddQueryInputPropertyToSearchAction.cs‎

File renamed without changes.

‎Tools/Schema.NET.Tool/CustomOverrides/IClassOverride.cs‎ renamed to ‎Tools/Schema.NET.Tool.Shared/CustomOverrides/IClassOverride.cs‎

File renamed without changes.

‎Tools/Schema.NET.Tool/CustomOverrides/IEnumerationOverride.cs‎ renamed to ‎Tools/Schema.NET.Tool.Shared/CustomOverrides/IEnumerationOverride.cs‎

File renamed without changes.

‎Tools/Schema.NET.Tool/CustomOverrides/RenameEventProperty.cs‎ renamed to ‎Tools/Schema.NET.Tool.Shared/CustomOverrides/RenameEventProperty.cs‎

File renamed without changes.

0 commit comments

Comments
 (0)