Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit a2689ba

Browse files
MiYanniMiYanni
authored
Fix TestPackage paths (#42136)
2 parents 22ea878 + 850659b commit a2689ba

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

‎test/Microsoft.NET.TestFramework/BuildTestPackages.targets

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848

4949
<Target Name="SetupTestPackageProjectBaseData">
5050
<ItemGroup>
51-
<BaseTestPackageProject Include="PackageWithFakeNativeDep"
51+
<BaseTestPackageProject Include="test/TestAssets/TestPackages/PackageWithFakeNativeDep"
5252
Condition="$([MSBuild]::IsOSPlatform(`Windows`))" >
5353
<Name>PackageWithFakeNativeDep</Name>
5454
<ProjectName>PackageWithFakeNativeDep.csproj</ProjectName>
@@ -57,79 +57,79 @@
5757
<Version>1.0.0</Version>
5858
<Clean>True</Clean>
5959
</BaseTestPackageProject>
60-
<BaseTestPackageProject Include="dotnet-dependency-context-test">
60+
<BaseTestPackageProject Include="test/TestAssets/TestPackages/dotnet-dependency-context-test">
6161
<Name>dotnet-dependency-context-test</Name>
6262
<ProjectName>dotnet-dependency-context-test.csproj</ProjectName>
6363
<IsTool>True</IsTool>
6464
<IsApplicable>True</IsApplicable>
6565
<Version>$(Version)</Version>
6666
<Clean>True</Clean>
6767
</BaseTestPackageProject>
68-
<BaseTestPackageProject Include="dotnet-hello/v1/dotnet-hello">
68+
<BaseTestPackageProject Include="test/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello">
6969
<Name>dotnet-hello</Name>
7070
<ProjectName>dotnet-hello.csproj</ProjectName>
7171
<IsTool>True</IsTool>
7272
<IsApplicable>True</IsApplicable>
7373
<Version>1.0.0</Version>
7474
<Clean>True</Clean>
7575
</BaseTestPackageProject>
76-
<BaseTestPackageProject Include="dotnet-hello/v2/dotnet-hello">
76+
<BaseTestPackageProject Include="test/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello">
7777
<Name>dotnet-hello</Name>
7878
<ProjectName>dotnet-hello.csproj</ProjectName>
7979
<IsTool>True</IsTool>
8080
<IsApplicable>True</IsApplicable>
8181
<Version>2.0.0</Version>
8282
<Clean>True</Clean>
8383
</BaseTestPackageProject>
84-
<BaseTestPackageProject Include="dotnet-outputsframeworkversion/dotnet-outputsframeworkversion-netcoreapp1.0">
84+
<BaseTestPackageProject Include="test/TestAssets/TestPackages/dotnet-outputsframeworkversion/dotnet-outputsframeworkversion-netcoreapp1.0">
8585
<Name>dotnet-outputsframeworkversion-netcoreapp1.0</Name>
8686
<ProjectName>dotnet-outputsframeworkversion-netcoreapp1.0.csproj</ProjectName>
8787
<IsTool>True</IsTool>
8888
<IsApplicable>True</IsApplicable>
8989
<Version>1.0.0</Version>
9090
<Clean>True</Clean>
9191
</BaseTestPackageProject>
92-
<BaseTestPackageProject Include="dotnet-portable">
92+
<BaseTestPackageProject Include="test/TestAssets/TestPackages/dotnet-portable">
9393
<Name>dotnet-portable</Name>
9494
<ProjectName>dotnet-portable.csproj</ProjectName>
9595
<IsTool>True</IsTool>
9696
<IsApplicable>True</IsApplicable>
9797
<Version>1.0.0</Version>
9898
<Clean>True</Clean>
9999
</BaseTestPackageProject>
100-
<BaseTestPackageProject Include="dotnet-portable-v1">
100+
<BaseTestPackageProject Include="test/TestAssets/TestPackages/dotnet-portable-v1">
101101
<Name>dotnet-portable</Name>
102102
<ProjectName>dotnet-portable-v1.csproj</ProjectName>
103103
<IsTool>True</IsTool>
104104
<IsApplicable>True</IsApplicable>
105105
<Version>1.0.0</Version>
106106
<Clean>True</Clean>
107107
</BaseTestPackageProject>
108-
<BaseTestPackageProject Include="dotnet-portable-v1-prefercli">
108+
<BaseTestPackageProject Include="test/TestAssets/TestPackages/dotnet-portable-v1-prefercli">
109109
<Name>dotnet-portable</Name>
110110
<ProjectName>dotnet-portable-v1-prefercli.csproj</ProjectName>
111111
<IsTool>True</IsTool>
112112
<IsApplicable>True</IsApplicable>
113113
<Version>1.0.0</Version>
114114
<Clean>True</Clean>
115115
</BaseTestPackageProject>
116-
<BaseTestPackageProject Include="dotnet-fallbackfoldertool">
116+
<BaseTestPackageProject Include="test/TestAssets/TestPackages/dotnet-fallbackfoldertool">
117117
<Name>dotnet-fallbackfoldertool</Name>
118118
<ProjectName>dotnet-fallbackfoldertool.csproj</ProjectName>
119119
<IsTool>True</IsTool>
120120
<IsApplicable>True</IsApplicable>
121121
<Version>1.0.0</Version>
122122
<Clean>True</Clean>
123123
</BaseTestPackageProject>
124-
<BaseTestPackageProject Include="dotnet-prefercliruntime">
124+
<BaseTestPackageProject Include="test/TestAssets/TestPackages/dotnet-prefercliruntime">
125125
<Name>dotnet-prefercliruntime</Name>
126126
<ProjectName>dotnet-prefercliruntime.csproj</ProjectName>
127127
<IsTool>True</IsTool>
128128
<IsApplicable>True</IsApplicable>
129129
<Version>1.0.0</Version>
130130
<Clean>True</Clean>
131131
</BaseTestPackageProject>
132-
<BaseTestPackageProject Include="ToolWithOutputName">
132+
<BaseTestPackageProject Include="test/TestAssets/TestPackages/ToolWithOutputName">
133133
<Name>dotnet-tool-with-output-name</Name>
134134
<ProjectName>ToolWithOutputName.csproj</ProjectName>
135135
<NuPkgName>ToolWithOutputName</NuPkgName>
@@ -138,15 +138,15 @@
138138
<Version>1.0.0</Version>
139139
<Clean>True</Clean>
140140
</BaseTestPackageProject>
141-
<BaseTestPackageProject Include="Library.ContainsAnalyzer">
141+
<BaseTestPackageProject Include="test/TestAssets/TestPackages/Library.ContainsAnalyzer">
142142
<Name>Library.ContainsAnalyzer</Name>
143143
<ProjectName>Library.ContainsAnalyzer.csproj</ProjectName>
144144
<NuPkgName>Library.ContainsAnalyzer</NuPkgName>
145145
<IsApplicable>True</IsApplicable>
146146
<Version>1.0.0</Version>
147147
<Clean>True</Clean>
148148
</BaseTestPackageProject>
149-
<BaseTestPackageProject Include="Library.ContainsAnalyzer2">
149+
<BaseTestPackageProject Include="test/TestAssets/TestPackages/Library.ContainsAnalyzer2">
150150
<Name>Library.ContainsAnalyzer2</Name>
151151
<ProjectName>Library.ContainsAnalyzer2.csproj</ProjectName>
152152
<NuPkgName>Library.ContainsAnalyzer2</NuPkgName>
@@ -165,7 +165,7 @@
165165
</BaseTestPackageProject>
166166

167167
<BaseTestPackageProject>
168-
<ProjectDir>$(RepoRoot)test/TestAssets/TestPackages/%(Identity)/</ProjectDir>
168+
<ProjectDir>$(RepoRoot)%(Identity)/</ProjectDir>
169169
<PackageOutput>$(TestPackagesDir)/%(NuPkgName).%(Version).nupkg</PackageOutput>
170170
</BaseTestPackageProject>
171171

0 commit comments

Comments
 (0)