Skip to content

Commit 6856992

Browse files
committed
restore a few conditionals now that we no longer package.lock.json
1 parent cd3128a commit 6856992

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

Directory.Build.props

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
<EnablePackageValidation>true</EnablePackageValidation>
3838
<OutputPath Condition="'$(OutputPathBaseDir)' != ''">$(OutputPathBaseDir)\$(MSBuildProjectName)\</OutputPath>
3939
<SolutionRoot>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.bat))</SolutionRoot>
40-
<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
4140

4241
<DefineConstants Condition="'$(TargetFramework)'=='net461' or '$(TargetFramework)'=='net472'">$(DefineConstants);FULLFRAMEWORK</DefineConstants>
4342
<DefineConstants Condition="$(DefineConstants.Contains(FULLFRAMEWORK)) == False">$(DefineConstants);DOTNETCORE</DefineConstants>
@@ -47,8 +46,7 @@
4746
<ExposedPublicKey>002400000480000094000000060200000024000052534131000400000100010025d3a22bf3781ba85067374ad832dfcba3c4fa8dd89227e36121ba17b2c33ad6b6ce03e45e562050a031e2ff7fe12cff9060a50acbc6a0eef9ef32dc258d90f874b2e76b581938071ccc4b4d98204d1d6ca7a1988d7a211f9fc98efd808cf85f61675b11007d0eb0461dc86a968d6af8ebba7e6b540303b54f1c1f5325c252be</ExposedPublicKey>
4847
</PropertyGroup>
4948
<ItemGroup>
50-
<!-- Include unconditionally due to difference in how dotnet cli and design time builds generate package.lock.json -->
51-
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.3"/>
49+
<PackageReference Condition="'$(TargetFramework)'=='net461' or '$(TargetFramework)'=='net472'" Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.3"/>
5250
</ItemGroup>
5351

5452
<ItemGroup>

src/Elastic.Clients.Elasticsearch.Serverless/Elastic.Clients.Elasticsearch.Serverless.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<None Include="..\..\README.md" Pack="true" PackagePath="\" />
3838
</ItemGroup>
3939
<ItemGroup>
40-
<Compile Include="..\Elastic.Clients.Elasticsearch\_Shared\**\*.cs" LinkBase="Shared" />
40+
<Compile Include="..\Elastic.Clients.Elasticsearch\_Shared\**\*.cs" LinkBase="_Shared" />
4141
</ItemGroup>
4242

4343
</Project>

0 commit comments

Comments
 (0)