Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Commit 782fdb1

Browse files
authored
Merge branch 'master' into jcansdale/TeamExplorer2017
2 parents e42a75e + 6c852c2 commit 782fdb1

File tree

642 files changed

+61180
-6521
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

642 files changed

+61180
-6521
lines changed

.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,5 @@ $RECYCLE.BIN/
235235
AkavacheSqliteLinkerOverride.cs
236236
NuGetBuild
237237
WiX.Toolset.DummyFile.txt
238-
nunit-UnitTests.xml
239-
nunit-TrackingCollectionTests.xml
238+
nunit-*.xml
240239
GitHubVS.sln.DotSettings

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
[submodule "submodules/rothko"]
2-
path = submodules/rothko
3-
url = https://github.com/editor-tools/Rothko.git
41
[submodule "submodules/reactiveui"]
52
path = submodules/reactiveui
63
url = https://github.com/editor-tools/ReactiveUI
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<ProjectConfiguration>
22
<Settings>
3+
<PreventSigningOfAssembly>False</PreventSigningOfAssembly>
34
<PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
45
</Settings>
56
</ProjectConfiguration>
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<ProjectConfiguration>
22
<Settings>
3+
<PreventSigningOfAssembly>False</PreventSigningOfAssembly>
34
<PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
45
</Settings>
56
</ProjectConfiguration>
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<ProjectConfiguration>
22
<Settings>
3+
<PreventSigningOfAssembly>False</PreventSigningOfAssembly>
34
<PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
45
</Settings>
56
</ProjectConfiguration>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<ProjectConfiguration>
22
<Settings>
3-
<PreventSigningOfAssembly>True</PreventSigningOfAssembly>
3+
<PreloadReferencedAssemblies>False</PreloadReferencedAssemblies>
44
<PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
55
</Settings>
66
</ProjectConfiguration>
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<ProjectConfiguration>
2+
<Settings>
3+
<CopyReferencedAssembliesToWorkspace>True</CopyReferencedAssembliesToWorkspace>
4+
<HiddenComponentWarnings>
5+
<Value>CopyReferencedAssembliesToWorkspaceIsOn</Value>
6+
</HiddenComponentWarnings>
7+
<PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
8+
</Settings>
9+
</ProjectConfiguration>
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<ProjectConfiguration>
2+
<Settings>
3+
<PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
4+
</Settings>
5+
</ProjectConfiguration>
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<ProjectConfiguration>
2+
<Settings>
3+
<PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
4+
</Settings>
5+
</ProjectConfiguration>
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
<ProjectConfiguration>
22
<Settings>
33
<CopyReferencedAssembliesToWorkspace>True</CopyReferencedAssembliesToWorkspace>
4+
<HiddenComponentWarnings>
5+
<Value>CopyReferencedAssembliesToWorkspaceIsOn</Value>
6+
</HiddenComponentWarnings>
47
<PreviouslyBuiltSuccessfully>True</PreviouslyBuiltSuccessfully>
58
</Settings>
69
</ProjectConfiguration>

0 commit comments

Comments
 (0)