Skip to content
This repository was archived by the owner on Dec 5, 2024. It is now read-only.

Commit 38de5bf

Browse files
StanleyGoldmanStanleyGoldman
committed
Removing submodules
1 parent af21dcf commit 38de5bf

File tree

9 files changed

+5
-111
lines changed

9 files changed

+5
-111
lines changed

‎.gitmodules‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
11
[submodule "script"]
22
path = script
33
url = git@github.com:github-for-unity/UnityBuildScripts
4-
[submodule "submodules/octokit.net"]
5-
path = submodules/octokit.net
6-
url = https://github.com/github-for-unity/octokit.net
7-
[submodule "submodules/dotnet-httpclient35"]
8-
path = submodules/dotnet-httpclient35
9-
url = https://github.com/github-for-unity/dotnet-httpClient35

‎GitHub.Unity.sln‎

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,10 @@ VisualStudioVersion = 14.0.25420.1
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.Unity", "src\UnityExtension\Assets\Editor\GitHub.Unity\GitHub.Unity.csproj", "{ADD7A18B-DD2A-4C22-A2C1-488964EFF30A}"
77
EndProject
8-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "octokit", "octokit", "{7DB5B8B0-5126-4025-913C-74B090ED625B}"
9-
EndProject
10-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Octokit-Extensions35", "submodules\octokit.net\Octokit-Extensions35\Octokit-Extensions35.csproj", "{EB4B074E-62A7-4F1D-8F95-E64B7AEA0236}"
11-
EndProject
12-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Octokit-35", "submodules\octokit.net\Octokit\Octokit-35.csproj", "{49EF16A2-5ED1-480F-80A1-D1D05D6C1BE4}"
13-
EndProject
148
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.Api", "src\GitHub.Api\GitHub.Api.csproj", "{B389ADAF-62CC-486E-85B4-2D8B078DF763}"
159
EndProject
1610
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.Logging", "src\GitHub.Logging\GitHub.Logging.csproj", "{BB6A8EDA-15D8-471B-A6ED-EE551E0B3BA0}"
1711
EndProject
18-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dotnet-httpclient35", "dotnet-httpclient35", "{D0CFD3E7-5B2C-4A54-ABF1-514D06F0747A}"
19-
EndProject
20-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Http-net_3_5", "submodules\dotnet-httpClient35\System.Net.Http\System.Net.Http-net_3_5.csproj", "{9862694D-E4FA-418B-8692-A0280FEDDF36}"
21-
EndProject
2212
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CopyLibrariesToDevelopmentFolder", "src\packaging\CopyLibrariesToDevelopmentFolder\CopyLibrariesToDevelopmentFolder.csproj", "{44257C81-EE4A-4817-9AF4-A26C02AA6DD4}"
2313
EndProject
2414
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests", "src\tests\UnitTests\UnitTests.csproj", "{69F13D9D-AD56-4EEC-AE10-D528EE23E1A9}"
@@ -50,18 +40,6 @@ Global
5040
{ADD7A18B-DD2A-4C22-A2C1-488964EFF30A}.dev|Any CPU.Build.0 = dev|Any CPU
5141
{ADD7A18B-DD2A-4C22-A2C1-488964EFF30A}.Release|Any CPU.ActiveCfg = Release|Any CPU
5242
{ADD7A18B-DD2A-4C22-A2C1-488964EFF30A}.Release|Any CPU.Build.0 = Release|Any CPU
53-
{EB4B074E-62A7-4F1D-8F95-E64B7AEA0236}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
54-
{EB4B074E-62A7-4F1D-8F95-E64B7AEA0236}.Debug|Any CPU.Build.0 = Debug|Any CPU
55-
{EB4B074E-62A7-4F1D-8F95-E64B7AEA0236}.dev|Any CPU.ActiveCfg = Debug|Any CPU
56-
{EB4B074E-62A7-4F1D-8F95-E64B7AEA0236}.dev|Any CPU.Build.0 = Debug|Any CPU
57-
{EB4B074E-62A7-4F1D-8F95-E64B7AEA0236}.Release|Any CPU.ActiveCfg = Release|Any CPU
58-
{EB4B074E-62A7-4F1D-8F95-E64B7AEA0236}.Release|Any CPU.Build.0 = Release|Any CPU
59-
{49EF16A2-5ED1-480F-80A1-D1D05D6C1BE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
60-
{49EF16A2-5ED1-480F-80A1-D1D05D6C1BE4}.Debug|Any CPU.Build.0 = Debug|Any CPU
61-
{49EF16A2-5ED1-480F-80A1-D1D05D6C1BE4}.dev|Any CPU.ActiveCfg = Debug|Any CPU
62-
{49EF16A2-5ED1-480F-80A1-D1D05D6C1BE4}.dev|Any CPU.Build.0 = Debug|Any CPU
63-
{49EF16A2-5ED1-480F-80A1-D1D05D6C1BE4}.Release|Any CPU.ActiveCfg = Release|Any CPU
64-
{49EF16A2-5ED1-480F-80A1-D1D05D6C1BE4}.Release|Any CPU.Build.0 = Release|Any CPU
6543
{B389ADAF-62CC-486E-85B4-2D8B078DF763}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
6644
{B389ADAF-62CC-486E-85B4-2D8B078DF763}.Debug|Any CPU.Build.0 = Debug|Any CPU
6745
{B389ADAF-62CC-486E-85B4-2D8B078DF763}.dev|Any CPU.ActiveCfg = dev|Any CPU
@@ -74,12 +52,6 @@ Global
7452
{BB6A8EDA-15D8-471B-A6ED-EE551E0B3BA0}.dev|Any CPU.Build.0 = dev|Any CPU
7553
{BB6A8EDA-15D8-471B-A6ED-EE551E0B3BA0}.Release|Any CPU.ActiveCfg = Release|Any CPU
7654
{BB6A8EDA-15D8-471B-A6ED-EE551E0B3BA0}.Release|Any CPU.Build.0 = Release|Any CPU
77-
{9862694D-E4FA-418B-8692-A0280FEDDF36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
78-
{9862694D-E4FA-418B-8692-A0280FEDDF36}.Debug|Any CPU.Build.0 = Debug|Any CPU
79-
{9862694D-E4FA-418B-8692-A0280FEDDF36}.dev|Any CPU.ActiveCfg = Debug|Any CPU
80-
{9862694D-E4FA-418B-8692-A0280FEDDF36}.dev|Any CPU.Build.0 = Debug|Any CPU
81-
{9862694D-E4FA-418B-8692-A0280FEDDF36}.Release|Any CPU.ActiveCfg = Release|Any CPU
82-
{9862694D-E4FA-418B-8692-A0280FEDDF36}.Release|Any CPU.Build.0 = Release|Any CPU
8355
{44257C81-EE4A-4817-9AF4-A26C02AA6DD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
8456
{44257C81-EE4A-4817-9AF4-A26C02AA6DD4}.Debug|Any CPU.Build.0 = Debug|Any CPU
8557
{44257C81-EE4A-4817-9AF4-A26C02AA6DD4}.dev|Any CPU.ActiveCfg = Debug|Any CPU
@@ -127,9 +99,6 @@ Global
12799
HideSolutionNode = FALSE
128100
EndGlobalSection
129101
GlobalSection(NestedProjects) = preSolution
130-
{EB4B074E-62A7-4F1D-8F95-E64B7AEA0236} = {7DB5B8B0-5126-4025-913C-74B090ED625B}
131-
{49EF16A2-5ED1-480F-80A1-D1D05D6C1BE4} = {7DB5B8B0-5126-4025-913C-74B090ED625B}
132-
{9862694D-E4FA-418B-8692-A0280FEDDF36} = {D0CFD3E7-5B2C-4A54-ABF1-514D06F0747A}
133102
{44257C81-EE4A-4817-9AF4-A26C02AA6DD4} = {B50B646C-3B86-4BDA-9F2B-766F96608CE0}
134103
{69F13D9D-AD56-4EEC-AE10-D528EE23E1A9} = {D17F1B4C-42DC-4E78-BCEF-9F239A084C4D}
135104
{1AC3F82E-AEAE-4C84-825C-207BB264FCFA} = {D17F1B4C-42DC-4E78-BCEF-9F239A084C4D}

‎src/GitHub.Api/GitHub.Api.csproj‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -244,18 +244,6 @@
244244
</Compile>
245245
</ItemGroup>
246246
<ItemGroup>
247-
<ProjectReference Include="..\..\submodules\dotnet-httpClient35\System.Net.Http\System.Net.Http-net_3_5.csproj">
248-
<Project>{9862694D-E4FA-418B-8692-A0280FEDDF36}</Project>
249-
<Name>System.Net.Http-net_3_5</Name>
250-
</ProjectReference>
251-
<ProjectReference Include="..\..\submodules\octokit.net\Octokit-Extensions35\Octokit-Extensions35.csproj">
252-
<Project>{eb4b074e-62a7-4f1d-8f95-e64b7aea0236}</Project>
253-
<Name>Octokit-Extensions35</Name>
254-
</ProjectReference>
255-
<ProjectReference Include="..\..\submodules\octokit.net\Octokit\Octokit-35.csproj">
256-
<Project>{49ef16a2-5ed1-480f-80a1-d1d05d6c1be4}</Project>
257-
<Name>Octokit-35</Name>
258-
</ProjectReference>
259247
<ProjectReference Include="..\GitHub.Logging\GitHub.Logging.csproj">
260248
<Project>{bb6a8eda-15d8-471b-a6ed-ee551e0b3ba0}</Project>
261249
<Name>GitHub.Logging</Name>

‎src/UnityExtension/Assets/Editor/GitHub.Unity/GitHub.Unity.csproj‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -125,14 +125,6 @@
125125
</None>
126126
</ItemGroup>
127127
<ItemGroup>
128-
<ProjectReference Include="..\..\..\..\..\submodules\octokit.net\Octokit-Extensions35\Octokit-Extensions35.csproj">
129-
<Project>{eb4b074e-62a7-4f1d-8f95-e64b7aea0236}</Project>
130-
<Name>Octokit-Extensions35</Name>
131-
</ProjectReference>
132-
<ProjectReference Include="..\..\..\..\..\submodules\octokit.net\Octokit\Octokit-35.csproj">
133-
<Project>{49ef16a2-5ed1-480f-80a1-d1d05d6c1be4}</Project>
134-
<Name>Octokit-35</Name>
135-
</ProjectReference>
136128
<ProjectReference Include="..\..\..\..\GitHub.Api\GitHub.Api.csproj">
137129
<Project>{b389adaf-62cc-486e-85b4-2d8b078df763}</Project>
138130
<Name>GitHub.Api</Name>

‎src/packaging/CopyLibrariesToDevelopmentFolder/CopyLibrariesToDevelopmentFolder.csproj‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,6 @@
2929
<WarningLevel>4</WarningLevel>
3030
</PropertyGroup>
3131
<ItemGroup>
32-
<ProjectReference Include="..\..\..\submodules\dotnet-httpClient35\System.Net.Http\System.Net.Http-net_3_5.csproj">
33-
<Project>{9862694d-e4fa-418b-8692-a0280feddf36}</Project>
34-
<Name>System.Net.Http-net_3_5</Name>
35-
</ProjectReference>
36-
<ProjectReference Include="..\..\..\submodules\octokit.net\Octokit-Extensions35\Octokit-Extensions35.csproj">
37-
<Project>{eb4b074e-62a7-4f1d-8f95-e64b7aea0236}</Project>
38-
<Name>Octokit-Extensions35</Name>
39-
</ProjectReference>
40-
<ProjectReference Include="..\..\..\submodules\octokit.net\Octokit\Octokit-35.csproj">
41-
<Project>{49ef16a2-5ed1-480f-80a1-d1d05d6c1be4}</Project>
42-
<Name>Octokit-35</Name>
43-
</ProjectReference>
4432
<ProjectReference Include="..\..\GitHub.Api\GitHub.Api.csproj">
4533
<Project>{b389adaf-62cc-486e-85b4-2d8b078df763}</Project>
4634
<Name>GitHub.Api</Name>

‎src/packaging/CopyLibrariesToPackageProject/CopyLibrariesToPackageProject.csproj‎

Lines changed: 5 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,6 @@
3030
<WarningLevel>4</WarningLevel>
3131
</PropertyGroup>
3232
<ItemGroup>
33-
<ProjectReference Include="..\..\..\submodules\dotnet-httpClient35\System.Net.Http\System.Net.Http-net_3_5.csproj">
34-
<Project>{9862694d-e4fa-418b-8692-a0280feddf36}</Project>
35-
<Name>System.Net.Http-net_3_5</Name>
36-
</ProjectReference>
37-
<ProjectReference Include="..\..\..\submodules\octokit.net\Octokit-Extensions35\Octokit-Extensions35.csproj">
38-
<Project>{eb4b074e-62a7-4f1d-8f95-e64b7aea0236}</Project>
39-
<Name>Octokit-Extensions35</Name>
40-
</ProjectReference>
41-
<ProjectReference Include="..\..\..\submodules\octokit.net\Octokit\Octokit-35.csproj">
42-
<Project>{49ef16a2-5ed1-480f-80a1-d1d05d6c1be4}</Project>
43-
<Name>Octokit-35</Name>
44-
</ProjectReference>
4533
<ProjectReference Include="..\..\GitHub.Api\GitHub.Api.csproj">
4634
<Project>{b389adaf-62cc-486e-85b4-2d8b078df763}</Project>
4735
<Name>GitHub.Api</Name>
@@ -131,33 +119,18 @@
131119
<CreateItem Include="$(OutputPath)\**\*.*">
132120
<Output TaskParameter="Include" ItemName="ToCopy" />
133121
</CreateItem>
134-
<Copy
135-
SourceFiles="@(ToCopy)"
136-
DestinationFiles="@(ToCopy->'$(PublishTo)\%(RecursiveDir)%(Filename)%(Extension)')"
137-
Condition="!$([System.String]::Copy('%(Filename)').Contains('deleteme')) and !$([System.String]::Copy('%(Extension)').Contains('xml')) and !$([System.String]::Copy('%(Extension)').Contains('pdb')) and !$([System.String]::Copy('%(Extension)').Contains('dll.mdb'))" />
122+
<Copy SourceFiles="@(ToCopy)" DestinationFiles="@(ToCopy->'$(PublishTo)\%(RecursiveDir)%(Filename)%(Extension)')" Condition="!$([System.String]::Copy('%(Filename)').Contains('deleteme')) and !$([System.String]::Copy('%(Extension)').Contains('xml')) and !$([System.String]::Copy('%(Extension)').Contains('pdb')) and !$([System.String]::Copy('%(Extension)').Contains('dll.mdb'))" />
138123
<CreateItem Include="$(PublishTo)\**\*.*">
139124
<Output TaskParameter="Include" ItemName="ToMoreCopy" />
140125
</CreateItem>
141-
<Copy SourceFiles="@(ToMoreCopy)"
142-
DestinationFiles="@(ToMoreCopy->'$(ExternalPublishTo)\%(RecursiveDir)%(Filename)%(Extension)')" Retries="0" ContinueOnError="WarnAndContinue" />
126+
<Copy SourceFiles="@(ToMoreCopy)" DestinationFiles="@(ToMoreCopy->'$(ExternalPublishTo)\%(RecursiveDir)%(Filename)%(Extension)')" Retries="0" ContinueOnError="WarnAndContinue" />
143127
</Target>
144-
145-
<Target
146-
Name="CopyMainAssembly"
147-
DependsOnTargets="DetectMainAssembly">
148-
149-
<Copy
150-
Condition="'%(IndirectDependency.FullPath)'!=''"
151-
SourceFiles="%(IndirectDependency.FullPath)"
152-
DestinationFolder="$(OutputPath)"
153-
SkipUnchangedFiles="true">
128+
<Target Name="CopyMainAssembly" DependsOnTargets="DetectMainAssembly">
129+
<Copy Condition="'%(IndirectDependency.FullPath)'!=''" SourceFiles="%(IndirectDependency.FullPath)" DestinationFolder="$(OutputPath)" SkipUnchangedFiles="true">
154130
<Output TaskParameter="CopiedFiles" ItemName="IndirectDependencyCopied" />
155131
</Copy>
156-
<Message Importance="high"
157-
Condition="'%(IndirectDependencyCopied.FullPath)'!='' and '%(IndirectDependencyCopied.Extension)'!='.pdb' and '%(IndirectDependencyCopied.Extension)'!='.xml'"
158-
Text="Dependency copied: %(IndirectDependencyCopied.FullPath)" />
132+
<Message Importance="high" Condition="'%(IndirectDependencyCopied.FullPath)'!='' and '%(IndirectDependencyCopied.Extension)'!='.pdb' and '%(IndirectDependencyCopied.Extension)'!='.xml'" Text="Dependency copied: %(IndirectDependencyCopied.FullPath)" />
159133
</Target>
160-
161134
<Target Name="DetectMainAssembly" DependsOnTargets="ResolveAssemblyReferences">
162135
<Message Importance="low" Text="Dependency: %(ReferencePath.Filename)%(ReferencePath.Extension) %(ReferencePath.CopyLocal)" />
163136
<!-- Creating indirect dependency list -->

‎src/tests/UnitTests/UnitTests.csproj‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -105,14 +105,6 @@
105105
<Compile Include="Properties\AssemblyInfo.cs" />
106106
</ItemGroup>
107107
<ItemGroup>
108-
<ProjectReference Include="$(SolutionDir)\submodules\octokit.net\Octokit-Extensions35\Octokit-Extensions35.csproj">
109-
<Project>{eb4b074e-62a7-4f1d-8f95-e64b7aea0236}</Project>
110-
<Name>Octokit-Extensions35</Name>
111-
</ProjectReference>
112-
<ProjectReference Include="$(SolutionDir)\submodules\octokit.net\Octokit\Octokit-35.csproj">
113-
<Project>{49ef16a2-5ed1-480f-80a1-d1d05d6c1be4}</Project>
114-
<Name>Octokit-35</Name>
115-
</ProjectReference>
116108
<ProjectReference Include="$(SolutionDir)\src\GitHub.Api\GitHub.Api.csproj">
117109
<Project>{B389ADAF-62CC-486E-85B4-2D8B078DF763}</Project>
118110
<Name>GitHub.Api</Name>

‎submodules/dotnet-httpclient35‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎submodules/octokit.net‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)