Skip to content

Commit

Permalink
moved to new sdk
Browse files Browse the repository at this point in the history
  • Loading branch information
kianzarrin committed Apr 22, 2021
1 parent 23776a9 commit 70d4479
Show file tree
Hide file tree
Showing 2 changed files with 117 additions and 186 deletions.
271 changes: 117 additions & 154 deletions PedestrianBridge/PedestrianBridge.csproj
Original file line number Diff line number Diff line change
@@ -1,179 +1,142 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{3818BA07-D208-4D16-B078-DFA47D4B8BFA}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>PedestrianBridge</RootNamespace>
<AssemblyName>PedestrianBridge</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<LangVersion>8.0</LangVersion>
<FileAlignment>512</FileAlignment>
<TargetFramework>net35</TargetFramework>
<Deterministic>false</Deterministic>
<AssemblyVersion>2.0.1.*</AssemblyVersion>
<LangVersion>latest</LangVersion>
<DebugType>full</DebugType>
<DebugSymbols>true</DebugSymbols>
<Configurations>Debug;Release;Workshop</Configurations>

<PathMap>$(MSBuildProjectDirectory)/=$(ProjectName)/</PathMap>
<ManagedDLLPath>../dependencies</ManagedDLLPath>
<SteamPath>~/Library/Application Support/Steam/</SteamPath>
<SteamPath Condition="! Exists ('$(SteamPath)')">$(ProgramFiles)/Steam</SteamPath>
<SteamPath Condition="! Exists ('$(SteamPath)')">$(Registry:HKEY_CURRENT_USER\Software\Valve\Steam@SteamPath)</SteamPath>
<CSPath>$(SteamPath)/steamapps/common/Cities_Skylines</CSPath>
<ContentPath>$(SteamPath)/steamapps/workshop/content/255710/$(ContentID)</ContentPath>
<ManagedDLLPath Condition="! Exists ('$(ManagedDLLPath)')">$(CSPath)/Cities_Data/Managed</ManagedDLLPath>
<AssemblySearchPaths>
$(AssemblySearchPaths);
$(ManagedDLLPath);
$(CitiesSkylinesBinaries);
../libs/
</AssemblySearchPaths>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>
</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<MangedDLLPath>..\dependencies</MangedDLLPath>
<SteamPath>~/Library/Application Support/Steam/</SteamPath>
<SteamPath Condition="! Exists ('$(SteamPath)')">$(ProgramFiles)\Steam</SteamPath>
<SteamPath Condition="! Exists ('$(SteamPath)')">$(Registry:HKEY_CURRENT_USER\Software\Valve\Steam@SteamPath)</SteamPath>
<CSPath>$(SteamPath)\steamapps\common\Cities_Skylines</CSPath>
<MangedDLLPath Condition="! Exists ('$(MangedDLLPath)')">$(CSPath)\Cities_Data\Managed</MangedDLLPath>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Workshop|AnyCPU' ">
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ContentID>2030755273</ContentID>
<ContentPath>$(SteamPath)/steamapps/workshop/content/255710/$(ContentID)</ContentPath>
</PropertyGroup>
<ItemGroup>
<Reference Include="Assembly-CSharp">
<HintPath>$(MangedDLLPath)\Assembly-CSharp.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="ColossalManaged">
<HintPath>$(MangedDLLPath)\ColossalManaged.dll</HintPath>
<ItemDefinitionGroup>
<Reference>
<Private>False</Private>
</Reference>
<Reference Include="CSUtil.Commons, Version=1.0.7347.7474, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\libs\CSUtil.Commons.dll</HintPath>
</Reference>
</ItemDefinitionGroup>
<ItemGroup>
<PackageReference Include="CitiesHarmony.API" Version="2.0.0" />
<PackageReference Include="Mono.Unofficial.pdb2mdb" Version="4.2.3.4" />
<PackageReference Include="GitInfo" Version="2.1.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>
<Reference Include="Assembly-CSharp" />
<Reference Include="ColossalManaged" />
<Reference Include="ICities" />
<Reference Include="UnityEngine" />
<Reference Include="UnityEngine.UI" />
<Reference Include="CSUtil.Commons" />
<Reference Include="FineRoadTool">
<HintPath>..\..\AutomaticRoundaboutBuilder\dependencies\FineRoadTool.dll</HintPath>
</Reference>
<Reference Include="ICities">
<HintPath>$(MangedDLLPath)\ICities.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="TrafficManager">
<HintPath>..\libs\TrafficManager.dll</HintPath>
</Reference>
<Reference Include="UnityEngine">
<HintPath>$(MangedDLLPath)\UnityEngine.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.Networking">
<HintPath>$(MangedDLLPath)\UnityEngine.Networking.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.UI">
<HintPath>$(MangedDLLPath)\UnityEngine.UI.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="TrafficManager" />
</ItemGroup>
<ItemGroup>
<Compile Include="KianCommons\KianCommons\Math\BezierUtil.cs" />
<Compile Include="KianCommons\KianCommons\Math\ControlPoint2.cs" />
<Compile Include="KianCommons\KianCommons\Math\ControlPoint3.cs" />
<Compile Include="KianCommons\KianCommons\Math\CubicBezier3.cs" />
<Compile Include="KianCommons\KianCommons\Math\LineUtil.cs" />
<Compile Include="KianCommons\KianCommons\Math\MathUtil.cs" />
<Compile Include="KianCommons\KianCommons\Math\VecetorUtils.cs" />
<None Include="KianCommons\KianCommons\Patches\TranspilerUtils.cs" />
<Compile Include="KianCommons\KianCommons\Math\Vector2D.cs" />
<Compile Include="KianCommons\KianCommons\Math\Vector3D.cs" />
<Compile Include="KianCommons\KianCommons\Plugins\PluginUtil.cs" />
<Compile Include="KianCommons\KianCommons\UI\Helpers\UIAutoSizePanel.cs" />
<Compile Include="KianCommons\KianCommons\UI\Helpers\UIButtonExt.cs" />
<Compile Include="KianCommons\KianCommons\UI\Helpers\UICheckBoxExt.cs" />
<Compile Include="KianCommons\KianCommons\UI\Helpers\UISliderExt.cs" />
<Compile Include="KianCommons\KianCommons\UI\RenderUtil.cs" />
<Compile Include="KianCommons\KianCommons\UI\TextureUtil.cs" />
<Compile Include="KianCommons\KianCommons\UI\UIKeymappingsPanel.cs" />
<Compile Include="KianCommons\KianCommons\UI\UIToolButton.cs" />
<Compile Include="KianCommons\KianCommons\UI\UIUtils.cs" />
<Compile Include="ControlCenter.cs" />
<Compile Include="KianCommons\KianCommons\Util\Assertion.cs" />
<Compile Include="KianCommons\KianCommons\Util\EnumBitMaskExtensions.cs" />
<Compile Include="KianCommons\KianCommons\Util\EnumerationExtensions.cs" />
<Compile Include="KianCommons\KianCommons\Util\GridUtil.cs" />
<Compile Include="KianCommons\KianCommons\Util\HelpersExtensions.cs" />
<Compile Include="KianCommons\KianCommons\Util\Log.cs" />
<Compile Include="KianCommons\KianCommons\Util\NetUtil.cs" />
<Compile Include="KianCommons\KianCommons\Util\ReflectionHelpers.cs" />
<Compile Include="KianCommons\KianCommons\Util\StringExtensions.cs" />
<Compile Include="PedestrianBridgeMod.cs" />
<Compile Include="Shapes\RoadBridge\RoadBridgeWrapper.cs" />
<Compile Include="Shapes\RoadBridge\RoadSideWrapper.cs" />
<Compile Include="Shapes\Roundabout\RaboutWraper.cs" />
<Compile Include="Shapes\Junction\JunctionWrapper.cs" />
<Compile Include="Shapes\Junction\LWarapper.cs" />
<Compile Include="Shapes\Netwrapper\NodeWrapper.cs" />
<Compile Include="Shapes\PathConnectWrapper.cs" />
<Compile Include="Shapes\Roundabout\RaboutSlice.cs" />
<Compile Include="Shapes\Netwrapper\SegmentWrapper.cs" />
<Compile Include="TestsExperiments.cs" />
<Compile Include="ThreadingExtension.cs" />
<Compile Include="Tool\KianToolBase.cs" />
<Compile Include="Tool\PedBridgeTool.cs" />
<Compile Include="UI\ControlPanel\SlopeSlider.cs" />
<Compile Include="UI\ControlPanel\ElevationSlider.cs" />
<Compile Include="UI\ControlPanel\StyleInnerCircleCheckBox.cs" />
<Compile Include="UI\ControlPanel\StyleStarCheckBox.cs" />
<Compile Include="UI\ControlPanel\ControlPanel.cs" />
<Compile Include="UI\ControlPanel\UnderpassCheckbox.cs" />
<Compile Include="UI\Settings.cs" />
<Compile Include="Util\RoundaboutUtil.cs" />
<Compile Include="Util\TMPEUtil.cs" />
<Compile Include="UI\PedestrianBridgeButton.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Util\PluginUtil.cs" />
<Compile Include="Util\PrefabUtil.cs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\sprites.png" />
<Compile Remove="KianCommons\KianCommons\Patches\TranspilerUtils.cs" />
<Compile Remove="KianCommons\KianCommons\LifeCycleBase.cs" />
<Compile Remove="KianCommons\KianCommons\Backport\GetSubArray.cs" />
<Compile Remove="KianCommons\KianCommons\IImplict\IMod.cs" />
<Compile Remove="KianCommons\KianCommons\IImplict\IMonoBehaviour.cs" />
<Compile Remove="KianCommons\KianCommons\ObjUnity3D\Int32Converter.cs" />
<Compile Remove="KianCommons\KianCommons\ObjUnity3D\OBJData.cs" />
<Compile Remove="KianCommons\KianCommons\ObjUnity3D\OBJFace.cs" />
<Compile Remove="KianCommons\KianCommons\ObjUnity3D\OBJFaceVertex.cs" />
<Compile Remove="KianCommons\KianCommons\ObjUnity3D\OBJGroup.cs" />
<Compile Remove="KianCommons\KianCommons\ObjUnity3D\OBJLoader.cs" />
<Compile Remove="KianCommons\KianCommons\ObjUnity3D\OBJMaterial.cs" />
<Compile Remove="KianCommons\KianCommons\Patches\HarmonyUtil.cs" />
<Compile Remove="KianCommons\KianCommons\Patches\PrefixUtils.cs" />
<Compile Remove="KianCommons\KianCommons\Plugins\AdaptiveRoadsUtil.cs" />
<Compile Remove="KianCommons\KianCommons\Plugins\CSURUtil.cs" />
<Compile Remove="KianCommons\KianCommons\Serialization\IOHelpers.cs" />
<Compile Remove="KianCommons\KianCommons\Serialization\JsonUtil.cs" />
<Compile Remove="KianCommons\KianCommons\Serialization\SerializationUtil.cs" />
<Compile Remove="KianCommons\KianCommons\Serialization\Vector3Serializable.cs" />
<Compile Remove="KianCommons\KianCommons\Serialization\XMLUtil.cs" />
<Compile Remove="KianCommons\KianCommons\UI\UIExtensions.cs" />
<Compile Remove="KianCommons\KianCommons\Util\AssemblyTypeExtensions.cs" />
<Compile Remove="KianCommons\KianCommons\Util\AuxilaryThread.cs" />
<Compile Remove="KianCommons\KianCommons\Util\MeshUtil.cs" />
<Compile Remove="KianCommons\KianCommons\Util\StackHelpers.cs" />
<Compile Remove="KianCommons\KianCommons\ObjUnity3D\Extensions\MeshExt.cs" />
<Compile Remove="KianCommons\KianCommons\ObjUnity3D\Extensions\StringExt.cs" />
<Compile Remove="KianCommons\KianCommons\ObjUnity3D\Extensions\Utils.cs" />
<Compile Remove="KianCommons\KianCommons\ObjUnity3D\Extensions\Vector3Ext.cs" />
<Compile Remove="KianCommons\KianCommons\ObjUnity3D\Extensions\Vector4Ext.cs" />
<Compile Remove="KianCommons\KianCommons\UI\Helpers\UICheckboxDropDownExt.cs" />
<Compile Remove="KianCommons\KianCommons\UI\Helpers\UIDropDownExt.cs" />
</ItemGroup>
<ItemGroup>
<None Include=".editorconfig" />
</ItemGroup>
<ItemGroup />
<ItemGroup>
<Content Include="KianCommons\.gitattributes" />
<Content Include="KianCommons\.gitignore" />
<Content Include="KianCommons\KianCommons.sln" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Target Name="PostBuildMacros">
<!-- Code from https://superuser.com/questions/82231/how-do-i-do-comments-at-a-windows-command-prompt -->
<Target Name="DeployToModDirectory" AfterTargets="Build">
<Message Importance="high" Text="DeployToModDirectory ..." />
<GetAssemblyIdentity AssemblyFiles="$(TargetPath)">
<Output TaskParameter="Assemblies" ItemName="Targets" />
</GetAssemblyIdentity>
<ItemGroup>
<VersionNumber Include="@(Targets->'%(Version)')" />
</ItemGroup>
</Target>
<PropertyGroup>
<PostBuildEventDependsOn>
$(PostBuildEventDependsOn);
PostBuildMacros;
</PostBuildEventDependsOn>
<PostBuildEvent>set "DEPLOYDIR=$(LOCALAPPDATA)\Colossal Order\Cities_Skylines\Addons\Mods\$(TargetName)\"

del "%25DEPLOYDIR%25$(TargetFileName)"
xcopy /y /v "$(TargetDir)$(TargetFileName)" "%25DEPLOYDIR%25"
<PropertyGroup>
<DeployDir Condition="'$(DeployDir)'==''">$(LOCALAPPDATA)/Colossal Order/Cities_Skylines/Addons/Mods/$(SolutionName)/</DeployDir>
<Now>$([System.DateTime]::Now.ToString("HH:mm:ss"))</Now>
<pdb2mdb>$(PkgMono_Unofficial_pdb2mdb)/tools/pdb2mdb.exe</pdb2mdb>
<ZipFileName>$(SolutionName)-V@(VersionNumber)-$(GitCommit)-$(Configuration).zip</ZipFileName>
<ZipFile>$(DeployDir)/../$(ZipFileName)</ZipFile>
</PropertyGroup>
<ItemGroup>
<OldZipFiles Include="$(DeployDir)/../$(SolutionName)-*-$(Configuration).zip" />
</ItemGroup>

echo THE ASSEMBLY VERSION IS: @(VersionNumber) created at %25time%25
set DEPLOYDIR=</PostBuildEvent>
</PropertyGroup>
<Delete Files="$(TargetPath).mdb" />
<Exec Command='"$(pdb2mdb)" "$(TargetPath)"' />
<Copy SourceFiles="$(TargetPath).mdb" DestinationFolder="$(DeployDir)" />
<Delete Files="$(DeployDir)$(TargetFileName)" />
<Copy SourceFiles="$(TargetPath)" DestinationFolder="$(DeployDir)" />
<Message Importance="high" Text="AssemblyVersion=@(VersionNumber) time=$(Now)" />
<Delete Files="@(OldZipFiles)" />
<ZipDirectory SourceDirectory="$(DeployDir)" DestinationFile="$(ZipFile)" />
</Target>
<Target Name="DeployToWorkshop" AfterTargets="DeployToModDirectory" Condition="'$(ContentID)'!=''">
<ItemGroup>
<FilesToDelete Include="$(ContentPath)/*.*" Exclude="$(ContentPath)/PreviewImage.png" />
<FilesToCopy Include="$(DeployDir)/*.*" />
</ItemGroup>
<Delete Files="@(FilesToDelete)" />
<Copy SourceFiles="@(FilesToCopy)" DestinationFolder="$(ContentPath)" />
<RemoveDir Directories="$(DeployDir)" />
<Message Importance="high" Text="Moved to $(ContentPath)" />
</Target>
<Target Name="CustomClean" BeforeTargets="CoreClean">
<RemoveDir Directories="$(TargetDir)" />
<PropertyGroup>
<DeployDir>$(LOCALAPPDATA)/Colossal Order/Cities_Skylines/Addons/Mods/$(SolutionName)/</DeployDir>
</PropertyGroup>
<Message Text="removing deploy directory" Importance="high" />
<RemoveDir Directories="$(DeployDir)" />
</Target>
</Project>
32 changes: 0 additions & 32 deletions PedestrianBridge/Properties/AssemblyInfo.cs

This file was deleted.

0 comments on commit 70d4479

Please sign in to comment.