Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/corefx.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSantiago Fernandez Madero <safern@microsoft.com>2017-03-17 21:15:42 +0300
committerGitHub <noreply@github.com>2017-03-17 21:15:42 +0300
commitb76f0fe10b1799416a5ec78ebca478762be62dd1 (patch)
tree194032b7eb1006b59d6e2d8f04b750a378866aa1 /src/System.ComponentModel.TypeConverter
parent1965847e794ff9e95a0b6aa647ece4af6e521d4b (diff)
Change assembly version in csproj instead of dir.props (#17238)
Diffstat (limited to 'src/System.ComponentModel.TypeConverter')
-rw-r--r--src/System.ComponentModel.TypeConverter/dir.props3
-rw-r--r--src/System.ComponentModel.TypeConverter/tests/Performance/System.ComponentModel.TypeConverter.Performance.Tests.csproj1
-rw-r--r--src/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.csproj1
3 files changed, 3 insertions, 2 deletions
diff --git a/src/System.ComponentModel.TypeConverter/dir.props b/src/System.ComponentModel.TypeConverter/dir.props
index 27918bd646..e35a1e8a9f 100644
--- a/src/System.ComponentModel.TypeConverter/dir.props
+++ b/src/System.ComponentModel.TypeConverter/dir.props
@@ -2,8 +2,7 @@
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\dir.props" />
<PropertyGroup>
- <!-- don't change the Asssembly Version as one test would break -->
- <AssemblyVersion>9.9.9.9</AssemblyVersion>
+ <AssemblyVersion>4.2.0.0</AssemblyVersion>
<IsNETCoreApp>true</IsNETCoreApp>
<IsUAP>true</IsUAP>
</PropertyGroup>
diff --git a/src/System.ComponentModel.TypeConverter/tests/Performance/System.ComponentModel.TypeConverter.Performance.Tests.csproj b/src/System.ComponentModel.TypeConverter/tests/Performance/System.ComponentModel.TypeConverter.Performance.Tests.csproj
index f2a2ee1b77..b97a8bedad 100644
--- a/src/System.ComponentModel.TypeConverter/tests/Performance/System.ComponentModel.TypeConverter.Performance.Tests.csproj
+++ b/src/System.ComponentModel.TypeConverter/tests/Performance/System.ComponentModel.TypeConverter.Performance.Tests.csproj
@@ -5,6 +5,7 @@
<IncludePerformanceTests>true</IncludePerformanceTests>
<DefineConstants>$(DefineConstants);PERFORMANCE_TESTS</DefineConstants>
<ProjectGuid>{89C76728-ECAF-4905-A33F-BD6BFED5E91D}</ProjectGuid>
+ <AssemblyVersion>9.9.9.9</AssemblyVersion>
</PropertyGroup>
<PropertyGroup>
<DebugEngines>{2E36F1D4-B23C-435D-AB41-18E608940038}</DebugEngines>
diff --git a/src/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.csproj b/src/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.csproj
index fbe50deed9..e312d949de 100644
--- a/src/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.csproj
+++ b/src/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.csproj
@@ -5,6 +5,7 @@
<ProjectGuid>{3F0326A1-9E19-4A6C-95CE-63E65C9D2030}</ProjectGuid>
<DefineConstants>$(DefineConstants);FUNCTIONAL_TESTS</DefineConstants>
<DebugEngines>{2E36F1D4-B23C-435D-AB41-18E608940038}</DebugEngines>
+ <AssemblyVersion>9.9.9.9</AssemblyVersion>
</PropertyGroup>
<!-- Default configurations to help VS understand the configurations -->
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Debug|AnyCPU'" />