Skip to content

Commit b4489ba

Browse files
fm-117fm-117
authored
WI #1834 Target .NET framework 4.7.2 (#1850)
1 parent 8f97b89 commit b4489ba

File tree

18 files changed

+53
-97
lines changed

18 files changed

+53
-97
lines changed

‎Analytics/packages.config‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Elasticsearch.Net" version="7.5.1" targetFramework="net47" />
4-
<package id="NLog" version="4.7.2" targetFramework="net47" />
5-
<package id="System.Buffers" version="4.5.0" targetFramework="net47" />
6-
<package id="System.Diagnostics.DiagnosticSource" version="4.7.0" targetFramework="net47" />
7-
<package id="System.Memory" version="4.5.3" targetFramework="net47" />
8-
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net47" />
9-
<package id="System.Runtime.CompilerServices.Unsafe" version="4.7.0" targetFramework="net47" />
3+
<package id="Elasticsearch.Net" version="7.5.1" targetFramework="net472" />
4+
<package id="NLog" version="4.7.2" targetFramework="net472" />
5+
<package id="System.Buffers" version="4.5.0" targetFramework="net472" />
6+
<package id="System.Diagnostics.DiagnosticSource" version="4.7.0" targetFramework="net472" />
7+
<package id="System.Memory" version="4.5.3" targetFramework="net472" />
8+
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
9+
<package id="System.Runtime.CompilerServices.Unsafe" version="4.7.0" targetFramework="net472" />
1010
</packages>

‎CLI/test/CLI.Test.csproj‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,9 @@
1818
<ItemGroup>
1919
<Reference Include="System" />
2020
</ItemGroup>
21-
<Choose>
22-
<When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
23-
<ItemGroup>
24-
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
25-
</ItemGroup>
26-
</When>
27-
<Otherwise>
28-
<ItemGroup>
29-
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework" />
30-
</ItemGroup>
31-
</Otherwise>
32-
</Choose>
21+
<ItemGroup>
22+
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework" />
23+
</ItemGroup>
3324
<ItemGroup>
3425
<Compile Include="*.cs" />
3526
<Compile Include="Properties\AssemblyInfo.cs" />

‎CSCup/App.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8" ?>
22
<configuration>
33
<startup>
4-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7" />
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
55
</startup>
66
</configuration>

‎Codegen/src/App.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8" ?>
22
<configuration>
33
<startup>
4-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7" />
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
55
</startup>
66
</configuration>

‎Codegen/src/Codegen.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\..\packages\TypeCobol.TemplateTask.1.1.0\lib\net46\TypeCobol.TemplateTask.props" Condition="Exists('..\..\packages\TypeCobol.TemplateTask.1.1.0\lib\net46\TypeCobol.TemplateTask.props')" />
3+
<Import Project="..\..\packages\TypeCobol.TemplateTask.1.3.0\lib\net472\TypeCobol.TemplateTask.props" Condition="Exists('..\..\packages\TypeCobol.TemplateTask.1.3.0\lib\net472\TypeCobol.TemplateTask.props')" />
44
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
55
<Import Project="..\..\TypeCobol\Common.props" />
66
<PropertyGroup>
@@ -60,7 +60,7 @@
6060
</TCTemplate>
6161
</ItemGroup>
6262
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
63-
<Import Project="..\..\packages\TypeCobol.TemplateTask.1.1.0\lib\net46\TypeCobol.TemplateTask.targets" Condition="Exists('..\..\packages\TypeCobol.TemplateTask.1.1.0\lib\net46\TypeCobol.TemplateTask.targets')" />
63+
<Import Project="..\..\packages\TypeCobol.TemplateTask.1.3.0\lib\net472\TypeCobol.TemplateTask.targets" Condition="Exists('..\..\packages\TypeCobol.TemplateTask.1.3.0\lib\net472\TypeCobol.TemplateTask.targets')" />
6464
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
6565
Other similar extension points exist, see Microsoft.Common.targets.
6666
<Target Name="BeforeBuild">

‎Codegen/src/packages.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Antlr4.Runtime" version="4.6.6" targetFramework="net47" />
4-
<package id="JetBrains.Annotations" version="2019.1.3" targetFramework="net47" />
5-
<package id="TypeCobol.TemplateTask" version="1.1.0" targetFramework="net46" developmentDependency="true" />
3+
<package id="Antlr4.Runtime" version="4.6.6" targetFramework="net472" />
4+
<package id="JetBrains.Annotations" version="2019.1.3" targetFramework="net472" />
5+
<package id="TypeCobol.TemplateTask" version="1.3.0" targetFramework="net472" developmentDependency="true" />
66
</packages>

‎Codegen/test/Codegen.Test.csproj‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,9 @@
1515
<TestProjectType>UnitTest</TestProjectType>
1616
<DoNotCopyLocalIfInGac>false</DoNotCopyLocalIfInGac>
1717
</PropertyGroup>
18-
<Choose>
19-
<When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
20-
<ItemGroup>
21-
</ItemGroup>
22-
</When>
23-
<Otherwise>
24-
<ItemGroup>
25-
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework" />
26-
</ItemGroup>
27-
</Otherwise>
28-
</Choose>
18+
<ItemGroup>
19+
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework" />
20+
</ItemGroup>
2921
<ItemGroup>
3022
<Compile Include="*.cs" />
3123
<Compile Include="Properties\AssemblyInfo.cs" />

‎TypeCobol.Analysis/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="JetBrains.Annotations" version="2019.1.3" targetFramework="net47" />
3+
<package id="JetBrains.Annotations" version="2019.1.3" targetFramework="net472" />
44
</packages>

‎TypeCobol.LanguageServer.Test/TypeCobol.LanguageServer.Test.csproj‎

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -25,30 +25,21 @@
2525
</Reference>
2626
<Reference Include="System" />
2727
<Reference Include="TypeCobol.LanguageServer.JsonRPC, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
28-
<HintPath>..\packages\TypeCobol.LanguageServer.JsonRPC.1.1.1\lib\net47\TypeCobol.LanguageServer.JsonRPC.dll</HintPath>
28+
<HintPath>..\packages\TypeCobol.LanguageServer.JsonRPC.1.1.2\lib\net472\TypeCobol.LanguageServer.JsonRPC.dll</HintPath>
2929
</Reference>
3030
<Reference Include="TypeCobol.LanguageServer.Protocol, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
31-
<HintPath>..\packages\TypeCobol.LanguageServer.Protocol.1.1.0\lib\net47\TypeCobol.LanguageServer.Protocol.dll</HintPath>
31+
<HintPath>..\packages\TypeCobol.LanguageServer.Protocol.1.1.1\lib\net472\TypeCobol.LanguageServer.Protocol.dll</HintPath>
3232
</Reference>
3333
<Reference Include="TypeCobol.LanguageServer.Robot.Common, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
34-
<HintPath>..\packages\TypeCobol.LanguageServer.Robot.Common.1.2.0\lib\net47\TypeCobol.LanguageServer.Robot.Common.dll</HintPath>
34+
<HintPath>..\packages\TypeCobol.LanguageServer.Robot.Common.1.2.1\lib\net472\TypeCobol.LanguageServer.Robot.Common.dll</HintPath>
3535
</Reference>
3636
<Reference Include="TypeCobol.LanguageServerRobot, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
37-
<HintPath>..\packages\TypeCobol.LanguageServerRobot.1.3.0\lib\net47\TypeCobol.LanguageServerRobot.exe</HintPath>
37+
<HintPath>..\packages\TypeCobol.LanguageServerRobot.1.3.1\lib\net472\TypeCobol.LanguageServerRobot.exe</HintPath>
3838
</Reference>
3939
</ItemGroup>
40-
<Choose>
41-
<When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
42-
<ItemGroup>
43-
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
44-
</ItemGroup>
45-
</When>
46-
<Otherwise>
47-
<ItemGroup>
48-
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework" />
49-
</ItemGroup>
50-
</Otherwise>
51-
</Choose>
40+
<ItemGroup>
41+
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework" />
42+
</ItemGroup>
5243
<ItemGroup>
5344
<Compile Include="LSRTest.cs" />
5445
<Compile Include="LSRTestHelper.cs" />

‎TypeCobol.LanguageServer.Test/packages.config‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net47" />
4-
<package id="TypeCobol.LanguageServer.JsonRPC" version="1.1.1" targetFramework="net47" />
5-
<package id="TypeCobol.LanguageServer.Protocol" version="1.1.0" targetFramework="net47" />
6-
<package id="TypeCobol.LanguageServer.Robot.Common" version="1.2.0" targetFramework="net47" />
7-
<package id="TypeCobol.LanguageServerRobot" version="1.3.0" targetFramework="net47" />
3+
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net472" />
4+
<package id="TypeCobol.LanguageServer.JsonRPC" version="1.1.2" targetFramework="net472" />
5+
<package id="TypeCobol.LanguageServer.Protocol" version="1.1.1" targetFramework="net472" />
6+
<package id="TypeCobol.LanguageServer.Robot.Common" version="1.2.1" targetFramework="net472" />
7+
<package id="TypeCobol.LanguageServerRobot" version="1.3.1" targetFramework="net472" />
88
</packages>

0 commit comments

Comments
 (0)