You've already forked linux-packaging-mono
Imported Upstream version 6.0.0.278
Former-commit-id: 8e546554fb8a6a1589c359278da385ff24d70cc3
This commit is contained in:
parent
8bc755c196
commit
4ed14e5c30
@@ -20,6 +20,9 @@ ROSLYN_FILES_FOR_MONO = \
|
||||
$(ROSLYN_CSC_DIR)/Microsoft.CodeAnalysis.Scripting.dll \
|
||||
$(ROSLYN_CSC_DIR)/System.Collections.Immutable.dll \
|
||||
$(ROSLYN_CSC_DIR)/System.Reflection.Metadata.dll \
|
||||
$(ROSLYN_CSC_DIR)/System.Runtime.CompilerServices.Unsafe.dll \
|
||||
$(ROSLYN_CSC_DIR)/System.Threading.Tasks.Extensions.dll \
|
||||
$(ROSLYN_CSC_DIR)/System.Memory.dll \
|
||||
$(ROSLYN_CSC_DIR)/VBCSCompiler.exe \
|
||||
$(ROSLYN_CSC_DIR)/VBCSCompiler.exe.config
|
||||
|
||||
@@ -29,8 +32,6 @@ ROSLYN_FILES_TO_COPY_FOR_MSBUILD = \
|
||||
$(ROSLYN_CSC_DIR)/Microsoft.Managed.Core.targets \
|
||||
$(ROSLYN_CSC_DIR)/Microsoft.VisualBasic.Core.targets
|
||||
|
||||
ROSLYN_DIM_FILES = $(topdir)/../external/roslyn-binaries/Prototypes/DefaultInterfaceImplementation/*
|
||||
|
||||
DISTFILES = $(ROSLYN_FILES_FOR_MONO) $(ROSLYN_FILES_TO_COPY_FOR_MSBUILD) csi-test.csx
|
||||
|
||||
ifeq ($(PROFILE), $(DEFAULT_PROFILE))
|
||||
@@ -38,7 +39,7 @@ ifeq ($(PROFILE), $(DEFAULT_PROFILE))
|
||||
TARGET_DIR = $(DESTDIR)$(mono_libdir)/mono/$(FRAMEWORK_VERSION)
|
||||
MSBUILD_ROSLYN_DIR = $(DESTDIR)$(mono_libdir)/mono/msbuild/Current/bin/Roslyn
|
||||
|
||||
install-local: install-prototypes
|
||||
install-local:
|
||||
$(MKINSTALLDIRS) $(TARGET_DIR)
|
||||
$(INSTALL_LIB) $(ROSLYN_FILES_FOR_MONO) $(TARGET_DIR)
|
||||
$(MKINSTALLDIRS) $(MSBUILD_ROSLYN_DIR)
|
||||
@@ -46,10 +47,6 @@ install-local: install-prototypes
|
||||
|
||||
(cd $(MSBUILD_ROSLYN_DIR); for asm in $(ROSLYN_FILES_FOR_MONO); do ln -fs ../../../../$(FRAMEWORK_VERSION)/$$(basename $$asm) . ; done)
|
||||
|
||||
install-prototypes:
|
||||
$(MKINSTALLDIRS) $(TARGET_DIR)/dim
|
||||
$(INSTALL_LIB) $(ROSLYN_DIM_FILES) $(TARGET_DIR)/dim
|
||||
|
||||
run-test-local: test-csi
|
||||
|
||||
test-csi:
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
b22c1001f96026227bfeb8765492c71397b2a250
|
||||
@@ -48,6 +48,12 @@
|
||||
<PdbFile Condition="'$(PdbFile)' == '' AND '$(OutputType)' == 'winmdobj' AND '$(_DebugSymbolsProduced)' == 'true'">$(IntermediateOutputPath)$(TargetName).compile.pdb</PdbFile>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
<LangVersion Condition="'$(LangVersion)' == '' AND
|
||||
(('$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND '$(TargetFrameworkVersion)' == 'v3.0') OR
|
||||
('$(TargetFrameworkIdentifier)' == '.NETStandard' AND '$(TargetFrameworkVersion)' == 'v2.1'))">preview</LangVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- Condition is to filter out the _CoreCompileResourceInputs so that it doesn't pass in culture resources to the compiler -->
|
||||
<Csc Condition="'%(_CoreCompileResourceInputs.WithCulture)' != 'true'"
|
||||
AdditionalLibPaths="$(AdditionalLibPaths)"
|
||||
@@ -65,6 +71,7 @@
|
||||
DefineConstants="$(DefineConstants)"
|
||||
DelaySign="$(DelaySign)"
|
||||
DisabledWarnings="$(NoWarn)"
|
||||
DisableSdkPath="$(DisableSdkPath)"
|
||||
DocumentationFile="@(DocFileItem)"
|
||||
EmbedAllSources="$(EmbedAllSources)"
|
||||
EmbeddedFiles="@(EmbeddedFiles)"
|
||||
@@ -88,6 +95,7 @@
|
||||
NoLogo="$(NoLogo)"
|
||||
NoStandardLib="$(NoCompilerStandardLib)"
|
||||
NoWin32Manifest="$(NoWin32Manifest)"
|
||||
NullableContextOptions="$(NullableContextOptions)"
|
||||
Optimize="$(Optimize)"
|
||||
Deterministic="$(Deterministic)"
|
||||
PublicSign="$(PublicSign)"
|
||||
@@ -99,6 +107,7 @@
|
||||
PreferredUILang="$(PreferredUILang)"
|
||||
ProvideCommandLineArgs="$(ProvideCommandLineArgs)"
|
||||
References="@(ReferencePathWithRefAssemblies)"
|
||||
RefOnly="$(ProduceOnlyReferenceAssembly)"
|
||||
ReportAnalyzer="$(ReportAnalyzer)"
|
||||
Resources="@(_CoreCompileResourceInputs);@(CompiledLicenseFile)"
|
||||
ResponseFiles="$(CompilerResponseFile)"
|
||||
Binary file not shown.
@@ -0,0 +1 @@
|
||||
38948683e151f6009580f20359e51270510c49d5
|
||||
@@ -0,0 +1 @@
|
||||
5cb9029bf1147f755252018acf04c7ea947b214a
|
||||
@@ -0,0 +1 @@
|
||||
b06cf34859cb7c700dfd8f87f8038fd2efbfa21c
|
||||
@@ -0,0 +1 @@
|
||||
7696c03b218eb7d3c30c858963d98687f17f8d9e
|
||||
@@ -9,16 +9,24 @@
|
||||
<Target Name="ShimReferencePathsWhenCommonTargetsDoesNotUnderstandReferenceAssemblies"
|
||||
BeforeTargets="CoreCompile"
|
||||
Condition="'@(ReferencePathWithRefAssemblies)' == ''">
|
||||
<!-- Common targets should populate this item from dev15.3, but this file
|
||||
may be used (via NuGet package) on earlier MSBuilds. If the
|
||||
adjusted-for-reference-assemblies item is not populated, just use
|
||||
the older item's contents. -->
|
||||
<!--
|
||||
FindReferenceAssembliesForReferences target in Common targets populate this item
|
||||
since dev15.3. The compiler targets may be used (via NuGet package) on earlier MSBuilds.
|
||||
If the ReferencePathWithRefAssemblies item is not populated, just use ReferencePaths
|
||||
(implementation assemblies) as they are.
|
||||
|
||||
Since XAML inner build runs CoreCompile directly (instead of Compile target),
|
||||
it also doesn't invoke FindReferenceAssembliesForReferences listed in CompileDependsOn.
|
||||
In that case we also populate ReferencePathWithRefAssemblies with implementation assemblies.
|
||||
-->
|
||||
<ItemGroup>
|
||||
<ReferencePathWithRefAssemblies Include="@(ReferencePath)" />
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
|
||||
<Target Name="_BeforeVBCSCoreCompile">
|
||||
<Target Name="_BeforeVBCSCoreCompile"
|
||||
DependsOnTargets="ShimReferencePathsWhenCommonTargetsDoesNotUnderstandReferenceAssemblies">
|
||||
|
||||
<ItemGroup Condition="'$(TargetingClr2Framework)' == 'true'">
|
||||
<ReferencePathWithRefAssemblies>
|
||||
<EmbedInteropTypes />
|
||||
@@ -50,6 +50,7 @@
|
||||
DebugType="$(DebugType)"
|
||||
DefineConstants="$(FinalDefineConstants)"
|
||||
DelaySign="$(DelaySign)"
|
||||
DisableSdkPath="$(DisableSdkPath)"
|
||||
DisabledWarnings="$(NoWarn)"
|
||||
DocumentationFile="@(DocFileItem)"
|
||||
EmbedAllSources="$(EmbedAllSources)"
|
||||
@@ -91,6 +92,7 @@
|
||||
PreferredUILang="$(PreferredUILang)"
|
||||
ProvideCommandLineArgs="$(ProvideCommandLineArgs)"
|
||||
References="@(ReferencePathWithRefAssemblies)"
|
||||
RefOnly="$(ProduceOnlyReferenceAssembly)"
|
||||
RemoveIntegerChecks="$(RemoveIntegerChecks)"
|
||||
ReportAnalyzer="$(ReportAnalyzer)"
|
||||
Resources="@(_CoreCompileResourceInputs);@(CompiledLicenseFile)"
|
||||
@@ -0,0 +1 @@
|
||||
049149f17929322dd246d994780d0399a24cf90f
|
||||
@@ -0,0 +1 @@
|
||||
2d54316954f4200997856156289df2e6115d51e0
|
||||
@@ -0,0 +1 @@
|
||||
52082366b0a69847cb0e6351ad4ac3690746f6b5
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,82 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
|
||||
<configuration>
|
||||
<startup>
|
||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
|
||||
</startup>
|
||||
<runtime>
|
||||
<gcServer enabled="true" />
|
||||
<gcConcurrent enabled="false" />
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="Microsoft.CodeAnalysis.CSharp" publicKeyToken="31bf3856ad364e35" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="Microsoft.CodeAnalysis" publicKeyToken="31bf3856ad364e35" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="Microsoft.CodeAnalysis.VisualBasic" publicKeyToken="31bf3856ad364e35" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-1.2.3.0" newVersion="1.2.3.0" />
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.1.3.0" newVersion="4.1.3.0" />
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-1.4.3.0" newVersion="1.4.3.0" />
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.4.1" newVersion="4.0.4.1" />
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Text.Encoding.CodePages" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
</runtime>
|
||||
<appSettings>
|
||||
<!-- Number of seconds with no activity before the server times out and closes.
|
||||
Set to -1 to never shut down the server. -->
|
||||
<add key="keepalive" value="600" />
|
||||
</appSettings>
|
||||
</configuration>
|
||||
Binary file not shown.
@@ -0,0 +1,71 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
|
||||
<configuration>
|
||||
<startup>
|
||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
|
||||
</startup>
|
||||
<runtime>
|
||||
<gcServer enabled="true" />
|
||||
<gcConcurrent enabled="false" />
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="Microsoft.CodeAnalysis.CSharp" publicKeyToken="31bf3856ad364e35" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="Microsoft.CodeAnalysis" publicKeyToken="31bf3856ad364e35" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-1.2.3.0" newVersion="1.2.3.0" />
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.1.3.0" newVersion="4.1.3.0" />
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-1.4.3.0" newVersion="1.4.3.0" />
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.4.1" newVersion="4.0.4.1" />
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Text.Encoding.CodePages" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
</runtime>
|
||||
</configuration>
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user