Skip to content
This repository has been archived by the owner on Jun 14, 2021. It is now read-only.

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@SuperJMN
SuperJMN committed Dec 29, 2016
1 parent 2e081c1 commit b987db7
Show file tree
Hide file tree
Showing 7 changed files with 65 additions and 94 deletions.
19 changes: 19 additions & 0 deletions Glass.Core/Glass.Core.xproj
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0.25420" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0.25420</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>29d35096-1a95-4761-b750-a521d91a4d96</ProjectGuid>
<RootNamespace>Glass.Core</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
</PropertyGroup>

<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>
19 changes: 19 additions & 0 deletions OmniXaml.Attributes/OmniXaml.Attributes.xproj
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0.25420" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0.25420</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>f4069349-412f-4f99-b4b4-9d79653a49ac</ProjectGuid>
<RootNamespace>OmniXaml.Attributes</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
</PropertyGroup>

<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>
31 changes: 3 additions & 28 deletions OmniXaml.Tests/app.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,42 +2,17 @@
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">

<dependentAssembly>
<assemblyIdentity name="System.ComponentModel.TypeConverter" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
</dependentAssembly>

<dependentAssembly>
<assemblyIdentity name="System.ComponentModel.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
</dependentAssembly>
<!--<dependentAssembly>
<assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Diagnostics.Tracing" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Reflection" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Reactive.Core" publicKeyToken="94bc3704cddfc263" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.0.3000.0" newVersion="3.0.3000.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.InteropServices" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Reactive.Linq" publicKeyToken="94bc3704cddfc263" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.0.3000.0" newVersion="3.0.3000.0" />
</dependentAssembly>-->

</assemblyBinding>
</runtime>
</configuration>
19 changes: 0 additions & 19 deletions OmniXaml.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OmniXaml.Tests", "OmniXaml.
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test Apps", "Test Apps", "{26F98C46-2AF5-4A77-9B8F-BE23F3B985F7}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "SampleModel", "SampleModel\SampleModel.xproj", "{7F47081F-6D93-4193-B4B7-C746EAF89BE1}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OmniXaml.Attributes", "OmniXaml.Attributes\OmniXaml.Attributes.csproj", "{4153120E-85ED-4CEB-AD0B-D5372744DDE8}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Glass.Core", "Glass.Core\Glass.Core.csproj", "{4AEFCFCF-5514-44B1-ACEF-93D40528A0BC}"
Expand Down Expand Up @@ -103,22 +101,6 @@ Global
{FCB2D580-B827-465E-B70A-304CB922CDC6}.Release|x64.Build.0 = Release|Any CPU
{FCB2D580-B827-465E-B70A-304CB922CDC6}.Release|x86.ActiveCfg = Release|Any CPU
{FCB2D580-B827-465E-B70A-304CB922CDC6}.Release|x86.Build.0 = Release|Any CPU
{7F47081F-6D93-4193-B4B7-C746EAF89BE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7F47081F-6D93-4193-B4B7-C746EAF89BE1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7F47081F-6D93-4193-B4B7-C746EAF89BE1}.Debug|ARM.ActiveCfg = Debug|Any CPU
{7F47081F-6D93-4193-B4B7-C746EAF89BE1}.Debug|ARM.Build.0 = Debug|Any CPU
{7F47081F-6D93-4193-B4B7-C746EAF89BE1}.Debug|x64.ActiveCfg = Debug|Any CPU
{7F47081F-6D93-4193-B4B7-C746EAF89BE1}.Debug|x64.Build.0 = Debug|Any CPU
{7F47081F-6D93-4193-B4B7-C746EAF89BE1}.Debug|x86.ActiveCfg = Debug|Any CPU
{7F47081F-6D93-4193-B4B7-C746EAF89BE1}.Debug|x86.Build.0 = Debug|Any CPU
{7F47081F-6D93-4193-B4B7-C746EAF89BE1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7F47081F-6D93-4193-B4B7-C746EAF89BE1}.Release|Any CPU.Build.0 = Release|Any CPU
{7F47081F-6D93-4193-B4B7-C746EAF89BE1}.Release|ARM.ActiveCfg = Release|Any CPU
{7F47081F-6D93-4193-B4B7-C746EAF89BE1}.Release|ARM.Build.0 = Release|Any CPU
{7F47081F-6D93-4193-B4B7-C746EAF89BE1}.Release|x64.ActiveCfg = Release|Any CPU
{7F47081F-6D93-4193-B4B7-C746EAF89BE1}.Release|x64.Build.0 = Release|Any CPU
{7F47081F-6D93-4193-B4B7-C746EAF89BE1}.Release|x86.ActiveCfg = Release|Any CPU
{7F47081F-6D93-4193-B4B7-C746EAF89BE1}.Release|x86.Build.0 = Release|Any CPU
{4153120E-85ED-4CEB-AD0B-D5372744DDE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4153120E-85ED-4CEB-AD0B-D5372744DDE8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4153120E-85ED-4CEB-AD0B-D5372744DDE8}.Debug|ARM.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -174,6 +156,5 @@ Global
GlobalSection(NestedProjects) = preSolution
{7751C7BD-85FA-49FF-AA52-0DE06DD2E9DA} = {26F98C46-2AF5-4A77-9B8F-BE23F3B985F7}
{D504DEEB-D6F3-4FD2-B1AE-DF7A2BE7C4E9} = {26F98C46-2AF5-4A77-9B8F-BE23F3B985F7}
{7F47081F-6D93-4193-B4B7-C746EAF89BE1} = {26F98C46-2AF5-4A77-9B8F-BE23F3B985F7}
EndGlobalSection
EndGlobal
19 changes: 19 additions & 0 deletions OmniXaml/OmniXaml.xproj
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0.25420" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0.25420</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>3db378e6-ea3b-4973-8214-61892acc2aa7</ProjectGuid>
<RootNamespace>OmniXaml</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
</PropertyGroup>

<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>
17 changes: 0 additions & 17 deletions SampleModel/project.fragment.lock.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,23 +51,6 @@
"copyToOutput": true
}
}
},
"OmniXaml.Services/1.0.0": {
"type": "project",
"framework": ".NETStandard,Version=v1.2",
"compile": {
"bin/Debug/OmniXaml.Services.dll": {}
},
"runtime": {
"bin/Debug/OmniXaml.Services.dll": {}
},
"contentFiles": {
"bin/Debug/OmniXaml.Services.pdb": {
"buildAction": "None",
"codeLanguage": "any",
"copyToOutput": true
}
}
}
}
}
35 changes: 5 additions & 30 deletions WpfApp/App.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,42 +2,17 @@
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<!--<dependentAssembly>
<assemblyIdentity name="System.ComponentModel.TypeConverter" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
</dependentAssembly>-->
<!--<dependentAssembly>
<assemblyIdentity name="System.ComponentModel.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
</dependentAssembly>

<dependentAssembly>
<assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Diagnostics.Tracing" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<assemblyIdentity name="System.ComponentModel.TypeConverter" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
</dependentAssembly>

<dependentAssembly>
<assemblyIdentity name="System.Reflection" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<assemblyIdentity name="System.ComponentModel.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Reactive.Core" publicKeyToken="94bc3704cddfc263" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.0.3000.0" newVersion="3.0.3000.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.InteropServices" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Reactive.Linq" publicKeyToken="94bc3704cddfc263" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.0.3000.0" newVersion="3.0.3000.0" />
</dependentAssembly>-->

</assemblyBinding>
</runtime>
</configuration>

0 comments on commit b987db7

Please sign in to comment.