summaryrefslogtreecommitdiff
path: root/external/rx/Rx/NET/Source/System.Reactive.Debugger
diff options
context:
space:
mode:
authorJo Shields <directhex@apebox.org>2014-02-19 22:12:43 +0000
committerJo Shields <directhex@apebox.org>2014-02-19 22:12:43 +0000
commit9972bf87b4f27d9c8f358ef8414ac1ab957a2f0f (patch)
tree5bb230c1d698659115f918e243c1d4b0aa4c7f51 /external/rx/Rx/NET/Source/System.Reactive.Debugger
parentd0a215f5626219ff7927f576588a777e5331c7be (diff)
downloadmono-upstream/3.2.8+dfsg.tar.gz
Imported Upstream version 3.2.8+dfsgupstream/3.2.8+dfsg
Diffstat (limited to 'external/rx/Rx/NET/Source/System.Reactive.Debugger')
-rw-r--r--external/rx/Rx/NET/Source/System.Reactive.Debugger/Properties/AssemblyInfo.cs14
-rw-r--r--external/rx/Rx/NET/Source/System.Reactive.Debugger/System.Reactive.Debugger.csproj2
2 files changed, 9 insertions, 7 deletions
diff --git a/external/rx/Rx/NET/Source/System.Reactive.Debugger/Properties/AssemblyInfo.cs b/external/rx/Rx/NET/Source/System.Reactive.Debugger/Properties/AssemblyInfo.cs
index e1a4c7996e..2932d0610e 100644
--- a/external/rx/Rx/NET/Source/System.Reactive.Debugger/Properties/AssemblyInfo.cs
+++ b/external/rx/Rx/NET/Source/System.Reactive.Debugger/Properties/AssemblyInfo.cs
@@ -27,11 +27,11 @@ using System.Security;
[assembly: AllowPartiallyTrustedCallers]
#endif
-#if XBOX_LAKEVIEW
-[assembly: SecurityTransparent]
-#endif
+// ===========================================================================
+// DO NOT EDIT OR REMOVE ANYTHING BELOW THIS COMMENT.
+// Version numbers are automatically generated in the msbuild files based on regular expressions
+// ===========================================================================
-//
-// Note: Assembly (file) version numbers get inserted by the build system on the fly. Inspect the Team Build workflows
-// and the custom activity in Build/Source/Activities/AppendVersionInfo.cs for more information.
-//
+[assembly: AssemblyVersion("2.2.0.0")]
+[assembly: AssemblyFileVersion("2.2.0.0")]
+[assembly: AssemblyInformationalVersion("2.2.0.0")]
diff --git a/external/rx/Rx/NET/Source/System.Reactive.Debugger/System.Reactive.Debugger.csproj b/external/rx/Rx/NET/Source/System.Reactive.Debugger/System.Reactive.Debugger.csproj
index 87ca262b66..87e97db2f8 100644
--- a/external/rx/Rx/NET/Source/System.Reactive.Debugger/System.Reactive.Debugger.csproj
+++ b/external/rx/Rx/NET/Source/System.Reactive.Debugger/System.Reactive.Debugger.csproj
@@ -12,6 +12,7 @@
<FileAlignment>512</FileAlignment>
<ProductSignAssembly>true</ProductSignAssembly>
<CodeAnalysisRuleSet>..\Rx.ruleset</CodeAnalysisRuleSet>
+ <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseXBLV|AnyCPU'">
<OutputPath>bin\ReleaseXBLV\</OutputPath>
@@ -56,4 +57,5 @@
</ProjectReference>
</ItemGroup>
<Import Project="..\Import.targets" />
+ <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
</Project> \ No newline at end of file