Skip to content

Commit c66f105

Browse files
IhateTrainsIhateTrains
committed
Replace commonItems submodule with PGCG.commonItems package
1 parent 1de5178 commit c66f105

9 files changed

+5093
-10
lines changed

‎.gitmodules

-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
[submodule "commonItems.NET"]
2-
path = commonItems.NET
3-
url = https://github.com/ParadoxGameConverters/commonItems.NET
41
[submodule "Updater"]
52
path = Updater
63
url = https://github.com/ParadoxGameConverters/Updater

‎Fronter.NET.sln

-6
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Fronter", "Fronter.NET\Fron
88
{B6ADE496-9DDD-4373-ACC9-E6D1855E5362} = {B6ADE496-9DDD-4373-ACC9-E6D1855E5362}
99
EndProjectSection
1010
EndProject
11-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "commonItems", "commonItems.NET\commonItems\commonItems.csproj", "{B6ADE496-9DDD-4373-ACC9-E6D1855E5362}"
12-
EndProject
1311
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fronter.Tests", "Fronter.NET.Tests\Fronter.Tests.csproj", "{2CEE7565-40A0-425E-BBFB-6BBFC43A9E09}"
1412
EndProject
1513
Global
@@ -22,10 +20,6 @@ Global
2220
{596F64CC-0EB8-4575-A5A5-32308E43CBDE}.Debug|Any CPU.Build.0 = Debug|Any CPU
2321
{596F64CC-0EB8-4575-A5A5-32308E43CBDE}.Release|Any CPU.ActiveCfg = Release|Any CPU
2422
{596F64CC-0EB8-4575-A5A5-32308E43CBDE}.Release|Any CPU.Build.0 = Release|Any CPU
25-
{B6ADE496-9DDD-4373-ACC9-E6D1855E5362}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
26-
{B6ADE496-9DDD-4373-ACC9-E6D1855E5362}.Debug|Any CPU.Build.0 = Debug|Any CPU
27-
{B6ADE496-9DDD-4373-ACC9-E6D1855E5362}.Release|Any CPU.ActiveCfg = Release|Any CPU
28-
{B6ADE496-9DDD-4373-ACC9-E6D1855E5362}.Release|Any CPU.Build.0 = Release|Any CPU
2923
{2CEE7565-40A0-425E-BBFB-6BBFC43A9E09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3024
{2CEE7565-40A0-425E-BBFB-6BBFC43A9E09}.Debug|Any CPU.Build.0 = Debug|Any CPU
3125
{2CEE7565-40A0-425E-BBFB-6BBFC43A9E09}.Release|Any CPU.ActiveCfg = Release|Any CPU

‎Fronter.NET/Fronter.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
<PackageReference Include="Markdown.Avalonia" Version="0.10.10" />
4545
<PackageReference Include="MessageBox.Avalonia" Version="2.0.0" />
4646
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
47+
<PackageReference Include="PGCG.commonItems" Version="0.1.0" />
4748
<PackageReference Include="system.io.filesystem" Version="4.3.0" />
4849
<PackageReference Include="System.Net.Primitives" Version="4.3.1" />
4950
</ItemGroup>

‎commonItems.NET

-1
This file was deleted.

‎commonItems.NET/commonItems/obj/commonItems.csproj.nuget.dgspec.json

+86
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
{
2+
"format": 1,
3+
"restore": {
4+
"D:\\GitHub\\IhateTrains\\Fronter.NET\\commonItems.NET\\commonItems\\commonItems.csproj": {}
5+
},
6+
"projects": {
7+
"D:\\GitHub\\IhateTrains\\Fronter.NET\\commonItems.NET\\commonItems\\commonItems.csproj": {
8+
"version": "1.0.0",
9+
"restore": {
10+
"projectUniqueName": "D:\\GitHub\\IhateTrains\\Fronter.NET\\commonItems.NET\\commonItems\\commonItems.csproj",
11+
"projectName": "commonItems",
12+
"projectPath": "D:\\GitHub\\IhateTrains\\Fronter.NET\\commonItems.NET\\commonItems\\commonItems.csproj",
13+
"packagesPath": "C:\\Users\\Seweryn\\.nuget\\packages\\",
14+
"outputPath": "D:\\GitHub\\IhateTrains\\Fronter.NET\\commonItems.NET\\commonItems\\obj\\",
15+
"projectStyle": "PackageReference",
16+
"configFilePaths": [
17+
"C:\\Users\\Seweryn\\AppData\\Roaming\\NuGet\\NuGet.Config",
18+
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
19+
],
20+
"originalTargetFrameworks": [
21+
"net6.0"
22+
],
23+
"sources": {
24+
"C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
25+
"C:\\Program Files\\dotnet\\library-packs": {},
26+
"https://api.nuget.org/v3/index.json": {},
27+
"https://www.myget.org/F/sixlabors/api/v3/index.json": {}
28+
},
29+
"frameworks": {
30+
"net6.0": {
31+
"targetAlias": "net6.0",
32+
"projectReferences": {}
33+
}
34+
},
35+
"warningProperties": {
36+
"warnAsError": [
37+
"NU1605"
38+
]
39+
}
40+
},
41+
"frameworks": {
42+
"net6.0": {
43+
"targetAlias": "net6.0",
44+
"dependencies": {
45+
"GameFinder.StoreHandlers.Steam": {
46+
"target": "Package",
47+
"version": "[1.7.2, )"
48+
},
49+
"Microsoft.Win32.Registry": {
50+
"target": "Package",
51+
"version": "[6.0.0-preview.5.21301.5, )"
52+
},
53+
"NCalcSync": {
54+
"target": "Package",
55+
"version": "[3.0.0, )"
56+
},
57+
"SharpZipLib": {
58+
"target": "Package",
59+
"version": "[1.3.3, )"
60+
},
61+
"log4net": {
62+
"target": "Package",
63+
"version": "[2.0.14, )"
64+
}
65+
},
66+
"imports": [
67+
"net461",
68+
"net462",
69+
"net47",
70+
"net471",
71+
"net472",
72+
"net48"
73+
],
74+
"assetTargetFallback": true,
75+
"warn": true,
76+
"frameworkReferences": {
77+
"Microsoft.NETCore.App": {
78+
"privateAssets": "all"
79+
}
80+
},
81+
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\6.0.300-preview.22204.3\\RuntimeIdentifierGraph.json"
82+
}
83+
}
84+
}
85+
}
86+
}

‎commonItems.NET/commonItems/obj/commonItems.csproj.nuget.g.props

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="utf-8" standalone="no"?>
2+
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
4+
<RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
5+
<RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
6+
<ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
7+
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
8+
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Seweryn\.nuget\packages\</NuGetPackageFolders>
9+
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
10+
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.0.0</NuGetToolVersion>
11+
</PropertyGroup>
12+
<ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
13+
<SourceRoot Include="C:\Users\Seweryn\.nuget\packages\" />
14+
</ItemGroup>
15+
</Project>

‎commonItems.NET/commonItems/obj/commonItems.csproj.nuget.g.targets

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<?xml version="1.0" encoding="utf-8" standalone="no"?>
2+
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" />

0 commit comments

Comments
 (0)