Skip to content

Commit 2b2f221

Browse files
JonnyOThanJonnyOThan
committed
switching to sdk style projects
1 parent 72d193b commit 2b2f221

22 files changed

+55
-1053
lines changed

‎KerbalVR_Mod/GameData/KerbalVR/KerbalVR.version

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
"NAME": "KerbalVR",
33
"URL": "https://github.com/FirstPersonKSP/Kerbal-VR/releases/latest/download/KerbalVR.version",
44
"DOWNLOAD": "https://github.com/FirstPersonKSP/Kerbal-VR/releases/latest",
5-
"VERSION": "0.9.4.1",
6-
"KSP_VERSION": "1.12.3",
7-
"KSP_VERSION_MIN": "1.12.3",
8-
"KSP_VERSION_MAX": "1.12.99"
5+
"VERSION": "0.9.4",
6+
"KSP_VERSION": "1.12",
7+
"KSP_VERSION_MIN": "1.8",
8+
"KSP_VERSION_MAX": "'1.12'"
99
}

‎KerbalVR_Mod/KerbalVR-InstallCheck/KerbalVR-InstallCheck.csproj

+3-24
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\KSPBuildTools.0.0.3-alpha.1\build\KSPBuildTools.props" Condition="Exists('..\packages\KSPBuildTools.0.0.3-alpha.1\build\KSPBuildTools.props')" />
4-
<Import Project="..\packages\JsonPoke.1.2.0\build\JsonPoke.props" Condition="Exists('..\packages\JsonPoke.1.2.0\build\JsonPoke.props')" />
5-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
62
<PropertyGroup>
73
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
84
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -11,7 +7,7 @@
117
<AppDesignerFolder>Properties</AppDesignerFolder>
128
<RootNamespace>KerbalVRInstallCheck</RootNamespace>
139
<AssemblyName>KerbalVR-InstallCheck</AssemblyName>
14-
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
10+
<TargetFramework>net4.8</TargetFramework>
1511
<FileAlignment>512</FileAlignment>
1612
<Deterministic>true</Deterministic>
1713
<NuGetPackageImportStamp>
@@ -35,23 +31,6 @@
3531
<WarningLevel>4</WarningLevel>
3632
</PropertyGroup>
3733
<ItemGroup>
38-
<Compile Include="InstallCheck.cs" />
39-
<Compile Include="Properties\AssemblyInfo.cs" />
34+
<PackageReference Include="KSPBuildTools" Version="0.0.3" />
4035
</ItemGroup>
41-
<ItemGroup>
42-
<None Include="packages.config" />
43-
</ItemGroup>
44-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
45-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
46-
<PropertyGroup>
47-
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
48-
</PropertyGroup>
49-
<Error Condition="!Exists('..\packages\JsonPoke.1.2.0\build\JsonPoke.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\JsonPoke.1.2.0\build\JsonPoke.props'))" />
50-
<Error Condition="!Exists('..\packages\JsonPoke.1.2.0\build\JsonPoke.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\JsonPoke.1.2.0\build\JsonPoke.targets'))" />
51-
<Error Condition="!Exists('..\packages\KSPBuildTools.0.0.3-alpha.1\build\KSPBuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\KSPBuildTools.0.0.3-alpha.1\build\KSPBuildTools.props'))" />
52-
<Error Condition="!Exists('..\packages\KSPBuildTools.0.0.3-alpha.1\build\KSPBuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\KSPBuildTools.0.0.3-alpha.1\build\KSPBuildTools.targets'))" />
53-
</Target>
54-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
55-
<Import Project="..\packages\JsonPoke.1.2.0\build\JsonPoke.targets" Condition="Exists('..\packages\JsonPoke.1.2.0\build\JsonPoke.targets')" />
56-
<Import Project="..\packages\KSPBuildTools.0.0.3-alpha.1\build\KSPBuildTools.targets" Condition="Exists('..\packages\KSPBuildTools.0.0.3-alpha.1\build\KSPBuildTools.targets')" />
5736
</Project>

‎KerbalVR_Mod/KerbalVR-InstallCheck/Properties/AssemblyInfo.cs

-16
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@
55
// General Information about an assembly is controlled through the following
66
// set of attributes. Change these attribute values to modify the information
77
// associated with an assembly.
8-
[assembly: AssemblyTitle("InstallCheck")]
98
[assembly: AssemblyDescription("")]
10-
[assembly: AssemblyConfiguration("")]
11-
[assembly: AssemblyCompany("")]
12-
[assembly: AssemblyProduct("InstallCheck")]
139
[assembly: AssemblyCopyright("Copyright © 2022")]
1410
[assembly: AssemblyTrademark("")]
1511
[assembly: AssemblyCulture("")]
@@ -22,15 +18,3 @@
2218
// The following GUID is for the ID of the typelib if this project is exposed to COM
2319
[assembly: Guid("fae38731-3efb-4f04-b342-242d97597474")]
2420

25-
// Version information for an assembly consists of the following four values:
26-
//
27-
// Major Version
28-
// Minor Version
29-
// Build Number
30-
// Revision
31-
//
32-
// You can specify all the values or you can default the Build and Revision Numbers
33-
// by using the '*' as shown below:
34-
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.0.0.0")]
36-
[assembly: AssemblyFileVersion("1.0.0.0")]

‎KerbalVR_Mod/KerbalVR-InstallCheck/packages.config

-5
This file was deleted.

‎KerbalVR_Mod/KerbalVR-MAS/KerbalVR-MAS.csproj

+7-30
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\KSPBuildTools.0.0.2\build\KSPBuildTools.props" Condition="Exists('..\packages\KSPBuildTools.0.0.2\build\KSPBuildTools.props')" />
4-
<Import Project="..\packages\JsonPoke.1.2.0\build\JsonPoke.props" Condition="Exists('..\packages\JsonPoke.1.2.0\build\JsonPoke.props')" />
5-
<Import Project="..\packages\Krafs.Publicizer.1.0.3\build\Krafs.Publicizer.props" Condition="Exists('..\packages\Krafs.Publicizer.1.0.3\build\Krafs.Publicizer.props')" />
6-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
72
<PropertyGroup>
83
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
94
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -12,7 +7,7 @@
127
<AppDesignerFolder>Properties</AppDesignerFolder>
138
<RootNamespace>KerbalVR_MAS</RootNamespace>
149
<AssemblyName>KerbalVR-MAS</AssemblyName>
15-
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
10+
<TargetFramework>net4.8</TargetFramework>
1611
<FileAlignment>512</FileAlignment>
1712
<Deterministic>true</Deterministic>
1813
<NuGetPackageImportStamp>
@@ -41,13 +36,6 @@
4136
<CKANIdentifier>AvionicsSystems</CKANIdentifier>
4237
</Reference>
4338
</ItemGroup>
44-
<ItemGroup>
45-
<Compile Include="Addon.cs" />
46-
<Compile Include="MASKnob.cs" />
47-
<Compile Include="MASSwitch.cs" />
48-
<Compile Include="Properties\AssemblyInfo.cs" />
49-
<Compile Include="MASLever.cs" />
50-
</ItemGroup>
5139
<ItemGroup>
5240
<Publicize Include="AvionicsSystems" />
5341
</ItemGroup>
@@ -58,21 +46,10 @@
5846
</ProjectReference>
5947
</ItemGroup>
6048
<ItemGroup>
61-
<None Include="packages.config" />
49+
<PackageReference Include="Krafs.Publicizer" Version="2.3.0">
50+
<PrivateAssets>all</PrivateAssets>
51+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
52+
</PackageReference>
53+
<PackageReference Include="KSPBuildTools" Version="0.0.3" />
6254
</ItemGroup>
63-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
64-
<PropertyGroup>
65-
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
66-
</PropertyGroup>
67-
<Error Condition="!Exists('..\packages\Krafs.Publicizer.1.0.3\build\Krafs.Publicizer.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Krafs.Publicizer.1.0.3\build\Krafs.Publicizer.props'))" />
68-
<Error Condition="!Exists('..\packages\Krafs.Publicizer.1.0.3\build\Krafs.Publicizer.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Krafs.Publicizer.1.0.3\build\Krafs.Publicizer.targets'))" />
69-
<Error Condition="!Exists('..\packages\JsonPoke.1.2.0\build\JsonPoke.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\JsonPoke.1.2.0\build\JsonPoke.props'))" />
70-
<Error Condition="!Exists('..\packages\JsonPoke.1.2.0\build\JsonPoke.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\JsonPoke.1.2.0\build\JsonPoke.targets'))" />
71-
<Error Condition="!Exists('..\packages\KSPBuildTools.0.0.2\build\KSPBuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\KSPBuildTools.0.0.2\build\KSPBuildTools.props'))" />
72-
<Error Condition="!Exists('..\packages\KSPBuildTools.0.0.2\build\KSPBuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\KSPBuildTools.0.0.2\build\KSPBuildTools.targets'))" />
73-
</Target>
74-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
75-
<Import Project="..\packages\Krafs.Publicizer.1.0.3\build\Krafs.Publicizer.targets" Condition="Exists('..\packages\Krafs.Publicizer.1.0.3\build\Krafs.Publicizer.targets')" />
76-
<Import Project="..\packages\JsonPoke.1.2.0\build\JsonPoke.targets" Condition="Exists('..\packages\JsonPoke.1.2.0\build\JsonPoke.targets')" />
77-
<Import Project="..\packages\KSPBuildTools.0.0.2\build\KSPBuildTools.targets" Condition="Exists('..\packages\KSPBuildTools.0.0.2\build\KSPBuildTools.targets')" />
7855
</Project>

‎KerbalVR_Mod/KerbalVR-MAS/Properties/AssemblyInfo.cs

-21
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@
55
// General Information about an assembly is controlled through the following
66
// set of attributes. Change these attribute values to modify the information
77
// associated with an assembly.
8-
[assembly: AssemblyTitle("KerbalVR-MAS")]
98
[assembly: AssemblyDescription("")]
10-
[assembly: AssemblyConfiguration("")]
11-
[assembly: AssemblyCompany("")]
12-
[assembly: AssemblyProduct("KerbalVR-MAS")]
139
[assembly: AssemblyCopyright("Copyright © 2022")]
1410
[assembly: AssemblyTrademark("")]
1511
[assembly: AssemblyCulture("")]
@@ -22,20 +18,3 @@
2218
// The following GUID is for the ID of the typelib if this project is exposed to COM
2319
[assembly: Guid("d2efbfe8-da01-427f-abfa-f2f52278787d")]
2420

25-
// Version information for an assembly consists of the following four values:
26-
//
27-
// Major Version
28-
// Minor Version
29-
// Build Number
30-
// Revision
31-
//
32-
// You can specify all the values or you can default the Build and Revision Numbers
33-
// by using the '*' as shown below:
34-
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("0.9.4.0")]
36-
[assembly: AssemblyFileVersion("0.9.4.0")]
37-
38-
39-
[assembly: KSPAssembly("KerbalVR-MAS", 0, 9, 4)]
40-
41-
[assembly: KSPAssemblyDependency("MOARdVAvionicsSystems", 1, 3)]

‎KerbalVR_Mod/KerbalVR-MAS/packages.config

-6
This file was deleted.

‎KerbalVR_Mod/KerbalVR-RPM/KerbalVR-RPM.csproj

+9-34
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\KSPBuildTools.0.0.2\build\KSPBuildTools.props" Condition="Exists('..\packages\KSPBuildTools.0.0.2\build\KSPBuildTools.props')" />
4-
<Import Project="..\packages\JsonPoke.1.2.0\build\JsonPoke.props" Condition="Exists('..\packages\JsonPoke.1.2.0\build\JsonPoke.props')" />
5-
<Import Project="..\packages\Krafs.Publicizer.1.0.3\build\Krafs.Publicizer.props" Condition="Exists('..\packages\Krafs.Publicizer.1.0.3\build\Krafs.Publicizer.props')" />
6-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
72
<PropertyGroup>
83
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
94
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -12,11 +7,9 @@
127
<AppDesignerFolder>Properties</AppDesignerFolder>
138
<RootNamespace>KerbalVR_RPM</RootNamespace>
149
<AssemblyName>KerbalVR-RPM</AssemblyName>
15-
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
10+
<TargetFramework>net4.8</TargetFramework>
1611
<FileAlignment>512</FileAlignment>
1712
<Deterministic>true</Deterministic>
18-
<NuGetPackageImportStamp>
19-
</NuGetPackageImportStamp>
2013
</PropertyGroup>
2114
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2215
<DebugSymbols>true</DebugSymbols>
@@ -38,41 +31,23 @@
3831
<Reference Include="$(KSPRoot)\GameData\JSI\RasterPropMonitor\Plugins\RasterPropMonitor.dll">
3932
<Private>False</Private>
4033
<CKANIdentifier>RasterPropMonitor-Core</CKANIdentifier>
34+
<KSPAssemblyName>RasterPropMonitor</KSPAssemblyName>
4135
</Reference>
4236
</ItemGroup>
43-
<ItemGroup>
44-
<Compile Include="Addon.cs" />
45-
<Compile Include="Properties\AssemblyInfo.cs" />
46-
<Compile Include="RPMKnob.cs" />
47-
<Compile Include="RPMLever.cs" />
48-
<Compile Include="RPMSwitch.cs" />
49-
</ItemGroup>
5037
<ItemGroup>
5138
<ProjectReference Include="..\KerbalVR\KerbalVR.csproj">
5239
<Project>{bbe6013a-e30c-43d6-919d-36176cdb2599}</Project>
5340
<Name>KerbalVR</Name>
5441
</ProjectReference>
5542
</ItemGroup>
5643
<ItemGroup>
57-
<None Include="packages.config" />
44+
<Publicize Include="RasterPropMonitor" />
5845
</ItemGroup>
59-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
60-
<PropertyGroup>
61-
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
62-
</PropertyGroup>
63-
<Error Condition="!Exists('..\packages\Krafs.Publicizer.1.0.3\build\Krafs.Publicizer.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Krafs.Publicizer.1.0.3\build\Krafs.Publicizer.props'))" />
64-
<Error Condition="!Exists('..\packages\Krafs.Publicizer.1.0.3\build\Krafs.Publicizer.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Krafs.Publicizer.1.0.3\build\Krafs.Publicizer.targets'))" />
65-
<Error Condition="!Exists('..\packages\JsonPoke.1.2.0\build\JsonPoke.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\JsonPoke.1.2.0\build\JsonPoke.props'))" />
66-
<Error Condition="!Exists('..\packages\JsonPoke.1.2.0\build\JsonPoke.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\JsonPoke.1.2.0\build\JsonPoke.targets'))" />
67-
<Error Condition="!Exists('..\packages\KSPBuildTools.0.0.2\build\KSPBuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\KSPBuildTools.0.0.2\build\KSPBuildTools.props'))" />
68-
<Error Condition="!Exists('..\packages\KSPBuildTools.0.0.2\build\KSPBuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\KSPBuildTools.0.0.2\build\KSPBuildTools.targets'))" />
69-
</Target>
70-
<Import Project="..\packages\Krafs.Publicizer.1.0.3\build\Krafs.Publicizer.targets" Condition="Exists('..\packages\Krafs.Publicizer.1.0.3\build\Krafs.Publicizer.targets')" />
7146
<ItemGroup>
72-
<Publicize Include="RasterPropMonitor" />
47+
<PackageReference Include="Krafs.Publicizer" Version="2.3.0">
48+
<PrivateAssets>all</PrivateAssets>
49+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
50+
</PackageReference>
51+
<PackageReference Include="KSPBuildTools" Version="0.0.3" />
7352
</ItemGroup>
74-
<ItemGroup />
75-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
76-
<Import Project="..\packages\JsonPoke.1.2.0\build\JsonPoke.targets" Condition="Exists('..\packages\JsonPoke.1.2.0\build\JsonPoke.targets')" />
77-
<Import Project="..\packages\KSPBuildTools.0.0.2\build\KSPBuildTools.targets" Condition="Exists('..\packages\KSPBuildTools.0.0.2\build\KSPBuildTools.targets')" />
7853
</Project>

‎KerbalVR_Mod/KerbalVR-RPM/Properties/AssemblyInfo.cs

-21
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@
55
// General Information about an assembly is controlled through the following
66
// set of attributes. Change these attribute values to modify the information
77
// associated with an assembly.
8-
[assembly: AssemblyTitle("KerbalVR-RPM")]
98
[assembly: AssemblyDescription("")]
10-
[assembly: AssemblyConfiguration("")]
11-
[assembly: AssemblyCompany("")]
12-
[assembly: AssemblyProduct("KerbalVR-RPM")]
139
[assembly: AssemblyCopyright("Copyright © 2022")]
1410
[assembly: AssemblyTrademark("")]
1511
[assembly: AssemblyCulture("")]
@@ -21,20 +17,3 @@
2117

2218
// The following GUID is for the ID of the typelib if this project is exposed to COM
2319
[assembly: Guid("132c7d00-6367-4312-bae1-4286435638e0")]
24-
25-
// Version information for an assembly consists of the following four values:
26-
//
27-
// Major Version
28-
// Minor Version
29-
// Build Number
30-
// Revision
31-
//
32-
// You can specify all the values or you can default the Build and Revision Numbers
33-
// by using the '*' as shown below:
34-
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("0.9.4.0")]
36-
[assembly: AssemblyFileVersion("0.9.4.0")]
37-
38-
[assembly: KSPAssembly("KerbalVR-RPM", 0, 9, 4)]
39-
40-
[assembly: KSPAssemblyDependency("RasterPropMonitor", 0, 18)]

‎KerbalVR_Mod/KerbalVR-RPM/packages.config

-6
This file was deleted.

0 commit comments

Comments
 (0)