Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Delete unnecessary netstandard builds #31641

Merged
merged 4 commits into from
Feb 4, 2020
Merged

Delete unnecessary netstandard builds #31641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a0e1118
Delete unnecessary netstandard builds and NuGet packages of inbox com…
jkotas Feb 2, 2020
c9312a4
Fix .NET Standard build
jkotas Feb 3, 2020
d3486fb
Remove packages from the baseline
jkotas Feb 3, 2020
99293c2
Merge branch 'master' into issue-2138
jkotas Feb 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 30 additions & 38 deletions src/libraries/Native/Windows/clrcompression/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,8 @@ if($ENV{__BuildArch} STREQUAL x86 OR $ENV{__BuildArch} STREQUAL x64)
zlib-intel/trees.c
zlib-intel/x86.c
zlib-intel/zutil.c
../../AnyOS/zlib/pal_zlib.c
)
elseif($ENV{__BuildArch} STREQUAL arm OR $ENV{__BuildArch} STREQUAL arm64)
else()
set(NATIVECOMPRESSION_SOURCES
zlib/adler32.c
zlib/compress.c
Expand All @@ -37,45 +36,38 @@ elseif($ENV{__BuildArch} STREQUAL arm OR $ENV{__BuildArch} STREQUAL arm64)
zlib/inftrees.c
zlib/trees.c
zlib/zutil.c
../../AnyOS/zlib/pal_zlib.c
)
endif()

if($ENV{__appContainer} STREQUAL true)
set (NATIVECOMPRESSION_SOURCES
${NATIVECOMPRESSION_SOURCES}
clrcompression.Uap.def
)
else()
set (NATIVECOMPRESSION_SOURCES
${NATIVECOMPRESSION_SOURCES}
clrcompression.def
../../AnyOS/brotli/common/dictionary.c
../../AnyOS/brotli/common/transform.c
../../AnyOS/brotli/dec/bit_reader.c
../../AnyOS/brotli/dec/decode.c
../../AnyOS/brotli/dec/huffman.c
../../AnyOS/brotli/dec/state.c
../../AnyOS/brotli/enc/backward_references.c
../../AnyOS/brotli/enc/backward_references_hq.c
../../AnyOS/brotli/enc/bit_cost.c
../../AnyOS/brotli/enc/block_splitter.c
../../AnyOS/brotli/enc/brotli_bit_stream.c
../../AnyOS/brotli/enc/cluster.c
../../AnyOS/brotli/enc/compress_fragment.c
../../AnyOS/brotli/enc/compress_fragment_two_pass.c
../../AnyOS/brotli/enc/dictionary_hash.c
../../AnyOS/brotli/enc/encode.c
../../AnyOS/brotli/enc/encoder_dict.c
../../AnyOS/brotli/enc/entropy_encode.c
../../AnyOS/brotli/enc/histogram.c
../../AnyOS/brotli/enc/literal_cost.c
../../AnyOS/brotli/enc/memory.c
../../AnyOS/brotli/enc/metablock.c
../../AnyOS/brotli/enc/static_dict.c
../../AnyOS/brotli/enc/utf8_util.c
)
endif()
set (NATIVECOMPRESSION_SOURCES
${NATIVECOMPRESSION_SOURCES}
../../AnyOS/zlib/pal_zlib.c
../../AnyOS/brotli/common/dictionary.c
../../AnyOS/brotli/common/transform.c
../../AnyOS/brotli/dec/bit_reader.c
../../AnyOS/brotli/dec/decode.c
../../AnyOS/brotli/dec/huffman.c
../../AnyOS/brotli/dec/state.c
../../AnyOS/brotli/enc/backward_references.c
../../AnyOS/brotli/enc/backward_references_hq.c
../../AnyOS/brotli/enc/bit_cost.c
../../AnyOS/brotli/enc/block_splitter.c
../../AnyOS/brotli/enc/brotli_bit_stream.c
../../AnyOS/brotli/enc/cluster.c
../../AnyOS/brotli/enc/compress_fragment.c
../../AnyOS/brotli/enc/compress_fragment_two_pass.c
../../AnyOS/brotli/enc/dictionary_hash.c
../../AnyOS/brotli/enc/encode.c
../../AnyOS/brotli/enc/encoder_dict.c
../../AnyOS/brotli/enc/entropy_encode.c
../../AnyOS/brotli/enc/histogram.c
../../AnyOS/brotli/enc/literal_cost.c
../../AnyOS/brotli/enc/memory.c
../../AnyOS/brotli/enc/metablock.c
../../AnyOS/brotli/enc/static_dict.c
../../AnyOS/brotli/enc/utf8_util.c
clrcompression.def
)

#Include Brotli include files
include_directories("../../AnyOS/brotli/include")
Expand Down
10 changes: 0 additions & 10 deletions src/libraries/Native/Windows/clrcompression/clrcompression.Uap.def
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion src/libraries/Native/build-native.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ set __CMakeBinDir=""
set __IntermediatesDir=""
set __BuildArch=x64
set __BuildTarget="build"
set __appContainer=""
set __VCBuildArch=x86_amd64
set __BuildOS=Windows_NT
set CMAKE_BUILD_TYPE=Debug
Expand Down
1 change: 0 additions & 1 deletion src/libraries/System.Buffers/ref/Configurations.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<Project>
<PropertyGroup>
<BuildConfigurations>
netstandard2.0;
$(NetCoreAppCurrent);
</BuildConfigurations>
</PropertyGroup>
Expand Down
19 changes: 0 additions & 19 deletions src/libraries/System.Buffers/ref/System.Buffers.cs
View file
Open in desktop

This file was deleted.

11 changes: 2 additions & 9 deletions src/libraries/System.Buffers/ref/System.Buffers.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<!-- Must match version supported by frameworks which support 4.0.* inbox.
Can be removed when API is added and this assembly is versioned to 4.1.* -->
<AssemblyVersion>4.0.2.0</AssemblyVersion>
<Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
<Nullable>enable</Nullable>
<Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
</PropertyGroup>
<ItemGroup Condition="'$(TargetsNetCoreApp)' != 'true'">
<Compile Include="System.Buffers.cs" />
</ItemGroup>
<ItemGroup Condition="'$(TargetsNetCoreApp)' == 'true'">
<ItemGroup>
<Compile Include="System.Buffers.Forwards.cs" />
<ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" />
</ItemGroup>
Expand Down
4 changes: 1 addition & 3 deletions src/libraries/System.IO.Pipelines/ref/System.IO.Pipelines.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,8 @@
<Compile Include="System.IO.Pipelines.cs" />
</ItemGroup>
<ItemGroup>
<Reference Include="System.Buffers" />
<Reference Include="System.Memory" />
<Reference Include="System.Threading.Tasks.Extensions" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\System.Buffers\ref\System.Buffers.csproj" />
</ItemGroup>
</Project>
1 change: 0 additions & 1 deletion src/libraries/System.Reflection.Emit.ILGeneration/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<Project>
<Import Project="..\Directory.Build.props" />
<PropertyGroup>
<AssemblyVersion Condition="'$(TargetsNetStandard)' == 'true'">4.0.0.0</AssemblyVersion>
<StrongNameKeyId>Microsoft</StrongNameKeyId>
<IsNETCoreApp>true</IsNETCoreApp>
</PropertyGroup>
Expand Down
25 changes: 0 additions & 25 deletions ...aries/System.Reflection.Emit.ILGeneration/pkg/System.Reflection.Emit.ILGeneration.pkgproj
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions src/libraries/System.Reflection.Emit.ILGeneration/ref/Configurations.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
<Project>
<PropertyGroup>
<PackageConfigurations>
netstandard2.0;
</PackageConfigurations>
<BuildConfigurations>
$(PackageConfigurations);
$(NetCoreAppCurrent);
<!-- Use inbox facade on $(NetFrameworkCurrent) -->
_$(NetFrameworkCurrent);
</BuildConfigurations>
</PropertyGroup>
</Project>
3 changes: 2 additions & 1 deletion src/libraries/System.Reflection.Emit.ILGeneration/ref/System.Reflection.Emit.ILGeneration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ public virtual void Emit(System.Reflection.Emit.OpCode opcode, string str) { }
public virtual void Emit(System.Reflection.Emit.OpCode opcode, System.Type cls) { }
public virtual void EmitCall(System.Reflection.Emit.OpCode opcode, System.Reflection.MethodInfo methodInfo, System.Type[]? optionalParameterTypes) { }
public virtual void EmitCalli(System.Reflection.Emit.OpCode opcode, System.Reflection.CallingConventions callingConvention, System.Type? returnType, System.Type[]? parameterTypes, System.Type[]? optionalParameterTypes) { }
public virtual void EmitCalli(System.Reflection.Emit.OpCode opcode, System.Runtime.InteropServices.CallingConvention unmanagedCallConv, System.Type? returnType, System.Type[]? parameterTypes) { }
public virtual void EmitWriteLine(System.Reflection.Emit.LocalBuilder localBuilder) { }
public virtual void EmitWriteLine(System.Reflection.FieldInfo fld) { }
public virtual void EmitWriteLine(string value) { }
Expand All @@ -56,7 +57,7 @@ public virtual void MarkLabel(System.Reflection.Emit.Label loc) { }
public virtual void ThrowException(System.Type excType) { }
public virtual void UsingNamespace(string usingNamespace) { }
}
public readonly partial struct Label
public readonly partial struct Label : System.IEquatable<System.Reflection.Emit.Label>
{
private readonly int _dummyPrimitive;
public override bool Equals(object? obj) { throw null; }
Expand Down
3 changes: 1 addition & 2 deletions ...raries/System.Reflection.Emit.ILGeneration/ref/System.Reflection.Emit.ILGeneration.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
<Configurations>$(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release</Configurations>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<Compile Include="System.Reflection.Emit.ILGeneration.cs" />
<Compile Include="System.Reflection.Emit.ILGeneration.netcore.cs" Condition="'$(TargetsNetCoreApp)' == 'true'" />
</ItemGroup>
<ItemGroup Condition="'$(TargetsNetStandard)' != 'true'">
<ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" />
Expand Down
18 changes: 0 additions & 18 deletions ...es/System.Reflection.Emit.ILGeneration/ref/System.Reflection.Emit.ILGeneration.netcore.cs
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions src/libraries/System.Reflection.Emit.ILGeneration/src/ApiCompatBaseline.uap10.0.16299.txt
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions src/libraries/System.Reflection.Emit.ILGeneration/src/Configurations.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
<Project>
<PropertyGroup>
<PackageConfigurations>
netstandard2.0;
netstandard1.0;
</PackageConfigurations>
<BuildConfigurations>
$(NetCoreAppCurrent)-Windows_NT;
$(NetCoreAppCurrent)-Unix;
$(PackageConfigurations);
</BuildConfigurations>
</PropertyGroup>
</Project>
Loading