Skip to content

Commit b78f47a

Browse files
committed
Update test project to reference csproj instead of compiled assembly
1 parent 6b1b9c5 commit b78f47a

File tree

7 files changed

+41
-32
lines changed

7 files changed

+41
-32
lines changed

src/dotnet-svcutil/lib/tests/Baselines/NetStandard20TypeReuse/TypeReuseClient/ServiceReference/Reference.cs

Lines changed: 10 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -14,37 +14,22 @@ namespace ServiceReference
1414

1515
[System.Diagnostics.DebuggerStepThroughAttribute()]
1616
[System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "99.99.99")]
17-
[System.Runtime.Serialization.DataContractAttribute(Name="TypeReuseCompositeType", Namespace="http://schemas.datacontract.org/2004/07/TypesLib")]
18-
public partial class TypeReuseCompositeType : object
17+
[System.Runtime.Serialization.DataContractAttribute(Name="BinLibrary", Namespace="http://schemas.datacontract.org/2004/07/BinLib")]
18+
public partial class BinLibrary : object
1919
{
2020

21-
private bool BoolValueField;
22-
23-
private string StringValueField;
24-
25-
[System.Runtime.Serialization.DataMemberAttribute()]
26-
public bool BoolValue
27-
{
28-
get
29-
{
30-
return this.BoolValueField;
31-
}
32-
set
33-
{
34-
this.BoolValueField = value;
35-
}
36-
}
21+
private string ValueField;
3722

3823
[System.Runtime.Serialization.DataMemberAttribute()]
39-
public string StringValue
24+
public string Value
4025
{
4126
get
4227
{
43-
return this.StringValueField;
28+
return this.ValueField;
4429
}
4530
set
4631
{
47-
this.StringValueField = value;
32+
this.ValueField = value;
4833
}
4934
}
5035
}
@@ -55,10 +40,10 @@ public interface ITypeReuseSvc
5540
{
5641

5742
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ITypeReuseSvc/GetData", ReplyAction="http://tempuri.org/ITypeReuseSvc/GetDataResponse")]
58-
System.Threading.Tasks.Task<BinLib.BinLibrary> GetDataAsync(int value);
43+
System.Threading.Tasks.Task<ServiceReference.BinLibrary> GetDataAsync(int value);
5944

6045
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ITypeReuseSvc/GetDataUsingDataContract", ReplyAction="http://tempuri.org/ITypeReuseSvc/GetDataUsingDataContractResponse")]
61-
System.Threading.Tasks.Task<ServiceReference.TypeReuseCompositeType> GetDataUsingDataContractAsync(ServiceReference.TypeReuseCompositeType composite);
46+
System.Threading.Tasks.Task<TypesLib.TypeReuseCompositeType> GetDataUsingDataContractAsync(TypesLib.TypeReuseCompositeType composite);
6247
}
6348

6449
[System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "99.99.99")]
@@ -111,12 +96,12 @@ public TypeReuseSvcClient(System.ServiceModel.Channels.Binding binding, System.S
11196
{
11297
}
11398

114-
public System.Threading.Tasks.Task<BinLib.BinLibrary> GetDataAsync(int value)
99+
public System.Threading.Tasks.Task<ServiceReference.BinLibrary> GetDataAsync(int value)
115100
{
116101
return base.Channel.GetDataAsync(value);
117102
}
118103

119-
public System.Threading.Tasks.Task<ServiceReference.TypeReuseCompositeType> GetDataUsingDataContractAsync(ServiceReference.TypeReuseCompositeType composite)
104+
public System.Threading.Tasks.Task<TypesLib.TypeReuseCompositeType> GetDataUsingDataContractAsync(TypesLib.TypeReuseCompositeType composite)
120105
{
121106
return base.Channel.GetDataUsingDataContractAsync(composite);
122107
}

src/dotnet-svcutil/lib/tests/Baselines/NetStandard20TypeReuse/TypeReuseClient/ServiceReference/dotnet-svcutil.params.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010
],
1111
"outputFile": "Reference.cs",
1212
"references": [
13-
"$TEMP$NetStandard20TypeReuse//TypeReuseClient//bin//Debug//netstandard2.0//BinLib.dll"
13+
"$TEMP$NetStandard20TypeReuse//TypeReuseClient//bin//Debug//netstandard2.0//TypesLib.dll",
14+
"System.Runtime, {System.Runtime, 99.99.99}",
15+
"System.Runtime.Serialization.Primitives, {System.Runtime.Serialization.Primitives, 99.99.99}"
1416
],
1517
"targetFramework": "netstandard2.0",
1618
"typeReuseMode": "All"

src/dotnet-svcutil/lib/tests/Baselines/NetStandard20TypeReuse/TypeReuseClient/TypeReuseClient.csproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44
<TargetFramework>netstandard2.0</TargetFramework>
55
</PropertyGroup>
66
<ItemGroup>
7-
<Reference Include="BinLib">
8-
<HintPath>../BinLib/BinLib.dll</HintPath>
9-
</Reference>
7+
<ProjectReference Include="../TypesLib/TypesLib.csproj" />
108
</ItemGroup>
119
<ItemGroup>
1210
<PackageReference Include="System.ServiceModel.*", Version="N.N.N">

src/dotnet-svcutil/lib/tests/TestCases/Netstandard20TypeReuse/TypeReuseClient/TypeReuseClient.csproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
<TargetFramework>netstandard2.0</TargetFramework>
55
</PropertyGroup>
66
<ItemGroup>
7-
<Reference Include="BinLib">
8-
<HintPath>..\BinLib\BinLib.dll</HintPath>
9-
</Reference>
7+
<ProjectReference Include="..\TypesLib\TypesLib.csproj" />
108
</ItemGroup>
119
</Project>
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
using System;
2+
using System.Runtime.Serialization;
3+
4+
namespace TypesLib
5+
{
6+
[DataContract]
7+
public class TypeReuseCompositeType
8+
{
9+
[DataMember]
10+
public bool BoolValue { get; set; } = true;
11+
12+
[DataMember]
13+
public string StringValue { get; set; } = "Hello ";
14+
}
15+
}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFrameworks>netstandard2.0</TargetFrameworks>
5+
</PropertyGroup>
6+
7+
<ItemGroup>
8+
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.1.1" />
9+
</ItemGroup>
10+
11+
</Project>

0 commit comments

Comments
 (0)