You've already forked linux-packaging-mono
Imported Upstream version 5.16.0.100
Former-commit-id: 38faa55fb9669e35e7d8448b15c25dc447f25767
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
parent
0a9828183b
commit
7d7f676260
@@ -4,12 +4,10 @@
|
||||
|
||||
<PropertyGroup>
|
||||
<PackageVersion>2.0.0</PackageVersion>
|
||||
<ServiceModelVersion>4.4.1</ServiceModelVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemDefinitionGroup>
|
||||
<LibraryPackage>
|
||||
<Version>4.4.0</Version>
|
||||
</LibraryPackage>
|
||||
<PrereleaseLibraryPackage>
|
||||
<Version>4.5.0</Version>
|
||||
</PrereleaseLibraryPackage>
|
||||
@@ -22,11 +20,13 @@
|
||||
<ItemGroup>
|
||||
<PrereleaseLibraryPackage Include="Microsoft.Win32.Registry" />
|
||||
<PrereleaseLibraryPackage Include="Microsoft.Win32.Registry.AccessControl" />
|
||||
<PrereleaseLibraryPackage Include="Microsoft.Win32.SystemEvents" />
|
||||
<PrereleaseLibraryPackage Include="System.CodeDom" />
|
||||
<PrereleaseLibraryPackage Include="System.ComponentModel.Composition" />
|
||||
<PrereleaseLibraryPackage Include="System.Configuration.ConfigurationManager" />
|
||||
<PrereleaseLibraryPackage Include="System.Data.Odbc" />
|
||||
<PrereleaseLibraryPackage Include="System.Data.DataSetExtensions" />
|
||||
<PrereleaseLibraryPackage Include="System.Data.SqlClient" />
|
||||
<PrereleaseLibraryPackage Include="System.Drawing.Common" />
|
||||
<PrereleaseLibraryPackage Include="System.Diagnostics.EventLog" />
|
||||
<PrereleaseLibraryPackage Include="System.Diagnostics.PerformanceCounter" />
|
||||
@@ -40,6 +40,7 @@
|
||||
<PrereleaseLibraryPackage Include="System.Management" />
|
||||
<PrereleaseLibraryPackage Include="System.Runtime.Caching" />
|
||||
<PrereleaseLibraryPackage Include="System.Security.AccessControl" />
|
||||
<PrereleaseLibraryPackage Include="System.Security.Cryptography.Cng" />
|
||||
<PrereleaseLibraryPackage Include="System.Security.Cryptography.Pkcs" />
|
||||
<PrereleaseLibraryPackage Include="System.Security.Cryptography.ProtectedData" />
|
||||
<PrereleaseLibraryPackage Include="System.Security.Cryptography.Xml" />
|
||||
@@ -50,18 +51,22 @@
|
||||
<PrereleaseLibraryPackage Include="System.Text.Encoding.CodePages" />
|
||||
<PrereleaseLibraryPackage Include="System.Threading.AccessControl" />
|
||||
|
||||
<!-- External pre-release packages -->
|
||||
<!-- Service model packages -->
|
||||
<LibraryPackage Include="System.ServiceModel.Primitives">
|
||||
<Version>4.4.1-servicing-25917-01</Version>
|
||||
<Version>$(ServiceModelVersion)</Version>
|
||||
</LibraryPackage>
|
||||
<LibraryPackage Include="System.ServiceModel.Duplex">
|
||||
<Version>$(ServiceModelVersion)</Version>
|
||||
</LibraryPackage>
|
||||
<LibraryPackage Include="System.ServiceModel.Http">
|
||||
<Version>$(ServiceModelVersion)</Version>
|
||||
</LibraryPackage>
|
||||
<LibraryPackage Include="System.ServiceModel.NetTcp">
|
||||
<Version>$(ServiceModelVersion)</Version>
|
||||
</LibraryPackage>
|
||||
<LibraryPackage Include="System.ServiceModel.Security">
|
||||
<Version>$(ServiceModelVersion)</Version>
|
||||
</LibraryPackage>
|
||||
|
||||
<!-- Stable packages shipped already for netcoreapp2.0 -->
|
||||
<LibraryPackage Include="System.Data.SqlClient" />
|
||||
<LibraryPackage Include="System.Security.Cryptography.Cng" />
|
||||
<LibraryPackage Include="System.ServiceModel.Duplex" />
|
||||
<LibraryPackage Include="System.ServiceModel.Http" />
|
||||
<LibraryPackage Include="System.ServiceModel.NetTcp" />
|
||||
<LibraryPackage Include="System.ServiceModel.Security" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
||||
@@ -3,31 +3,36 @@
|
||||
"System.ServiceModel.Primitives": {
|
||||
"StableVersions": [
|
||||
"4.4.0",
|
||||
"4.3.0"
|
||||
"4.3.0",
|
||||
"4.4.1"
|
||||
]
|
||||
},
|
||||
"System.ServiceModel.Duplex": {
|
||||
"StableVersions": [
|
||||
"4.4.0",
|
||||
"4.3.0"
|
||||
"4.3.0",
|
||||
"4.4.1"
|
||||
]
|
||||
},
|
||||
"System.ServiceModel.Http": {
|
||||
"StableVersions": [
|
||||
"4.4.0",
|
||||
"4.3.0"
|
||||
"4.3.0",
|
||||
"4.4.1"
|
||||
]
|
||||
},
|
||||
"System.ServiceModel.NetTcp": {
|
||||
"StableVersions": [
|
||||
"4.4.0",
|
||||
"4.3.0"
|
||||
"4.3.0",
|
||||
"4.4.1"
|
||||
]
|
||||
},
|
||||
"System.ServiceModel.Security": {
|
||||
"StableVersions": [
|
||||
"4.4.0",
|
||||
"4.3.0"
|
||||
"4.3.0",
|
||||
"4.4.1"
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,11 +1,21 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<DisableImplicitFrameworkReferences Condition="'$(TargetFramework)' == 'netcoreapp2.0'">true</DisableImplicitFrameworkReferences>
|
||||
<PreserveCompilationContext>true</PreserveCompilationContext>
|
||||
<PreserveCompilationContext>true</PreserveCompilationContext>
|
||||
<!-- Setting NETCoreAppMaximumVersion to a high version so that the sdk doesn't complain if we're restoring/publishing for a higher version than the sdk. -->
|
||||
<NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
|
||||
<PackageConflictPreferredPackages Condition="'$(TargetFramework)' != 'netcoreapp2.0'">Microsoft.Private.CoreFx.NETCoreApp;runtime.$(RID).Microsoft.Private.CoreFx.NETCoreApp;$(PackageConflictPreferredPackages)</PackageConflictPreferredPackages>
|
||||
<DisableImplicitFrameworkReferences Condition="$(TargetFramework.Contains('netcoreapp'))">true</DisableImplicitFrameworkReferences>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.Windows.Compatibility" Version="$(CompatibilityPackageVersion)" />
|
||||
<PackageReference Condition="'$(TargetFramework)' == 'netcoreapp2.0'" Include="Microsoft.NETCore.App" Version="2.0.0" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition="'$(TargetFramework)' != 'netcoreapp2.0'">
|
||||
<PackageReference Include="Microsoft.Private.CoreFx.NETCoreApp" Version="$(PrivateCorefxPackageVersion)" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.1.0-*" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
|
||||
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
|
||||
<PackageReference Include="Microsoft.NETCore.App" Version="2.0.0" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
@@ -1,27 +1,16 @@
|
||||
$repoRoot = ((get-item $PSScriptRoot).parent.parent.parent.FullName);
|
||||
$winRID = "win7-x64";
|
||||
$dotnetPath = -join($repoRoot, "\Tools\dotnetcli\dotnet.exe")
|
||||
$csprojPath = -join($PSScriptRoot, "\", (Get-ChildItem $PSScriptRoot"\*.csproj" | Select-Object -ExpandProperty Name))
|
||||
$packagesCachePath = -join($repoRoot, "\packages")
|
||||
$localPackageSourcePath = -join($repoRoot, "\bin\packages\Debug\")
|
||||
$packageName = "Microsoft.Windows.Compatibility"
|
||||
param (
|
||||
$targetFramework = "netcoreapp2.1",
|
||||
$runtimeVersion = "2.1.0-*",
|
||||
$refDirName = "netcoreapp21_compat",
|
||||
$rid = "win7-x64"
|
||||
)
|
||||
|
||||
if (!(Test-Path $localPackageSourcePath))
|
||||
{
|
||||
$localPackageSourcePath = -join($repoRoot, "\bin\packages\Release\")
|
||||
if (!(Test-Path $localPackageSourcePath))
|
||||
{
|
||||
Write-Error -Message "Local package source must exist.";
|
||||
Exit;
|
||||
}
|
||||
}
|
||||
|
||||
function _getPackageVersion()
|
||||
function _getPackageVersion($packageName)
|
||||
{
|
||||
$searchPattern = -join($localPackageSourcePath, $packageName, ".[0-9].[0-9].[0-9]*.nupkg")
|
||||
if (!(Test-Path $searchPattern))
|
||||
{
|
||||
Write-Error -Message (-join("Didn't find package: Microsoft.Windows.Compatibility in source: ", $localPackageSourcePath, " please run build -allConfigurations"))
|
||||
Write-Error -Message (-join("Didn't find package: ", $packageName, " in source: ", $localPackageSourcePath, " please run build -allConfigurations"))
|
||||
Exit;
|
||||
}
|
||||
|
||||
@@ -34,32 +23,47 @@ function _getPackageVersion()
|
||||
return $matches[0]
|
||||
}
|
||||
|
||||
function _restoreAndPublish($targetFramework, $rid, $runtimeFramework, $refDirName)
|
||||
$repoRoot = ((get-item $PSScriptRoot).parent.parent.parent.FullName);
|
||||
$dotnetPath = -join($repoRoot, "\Tools\dotnetcli\dotnet.exe")
|
||||
$csprojPath = -join($PSScriptRoot, "\", (Get-ChildItem $PSScriptRoot"\*.csproj" | Select-Object -ExpandProperty Name))
|
||||
$packagesCachePath = -join($repoRoot, "\packages")
|
||||
$localPackageSourcePath = -join($repoRoot, "\bin\packages\Debug\")
|
||||
|
||||
if (!(Test-Path $localPackageSourcePath))
|
||||
{
|
||||
$packageVersion = _getPackageVersion
|
||||
& $dotnetPath restore --packages $packagesCachePath /p:RestoreSources="https://api.nuget.org/v3/index.json;$localPackageSourcePath" /p:TargetFramework=$targetFramework /p:CompatibilityPackageVersion=$packageVersion $csprojPath
|
||||
& $dotnetPath publish -r $rid /p:RestoreSources="https://api.nuget.org/v3/index.json;$localPackageSourcePath" /p:TargetFramework=$targetFramework /p:CompatibilityPackageVersion=$packageVersion /p:RuntimeFrameworkVersion=$runtimeFramework $csprojPath
|
||||
|
||||
$outputPath = -join($PSScriptRoot, "\bin\Debug\", $targetFramework, "\", $rid, "\publish\refs\")
|
||||
|
||||
if (!(Test-Path $outputPath))
|
||||
{
|
||||
Write-Error -Message (-join("There was an error while publishing for framework: ", $targetFramework))
|
||||
Exit;
|
||||
}
|
||||
|
||||
Write-Output (-join("Published succedded for: ", $targetFramework))
|
||||
|
||||
$refPath = -join($repoRoot, "\bin\ref\", $refDirName)
|
||||
|
||||
if (Test-Path $refPath)
|
||||
$localPackageSourcePath = -join($repoRoot, "\bin\packages\Release\")
|
||||
if (!(Test-Path $localPackageSourcePath))
|
||||
{
|
||||
Remove-Item $refPath -r -force
|
||||
Write-Error -Message "Local package source must exist.";
|
||||
Exit;
|
||||
}
|
||||
|
||||
New-Item $refPath -ItemType directory
|
||||
Copy-Item (-join($outputPath, "*")) $refPath
|
||||
}
|
||||
|
||||
_restoreAndPublish "netcoreapp2.0" $winRID "2.0.0" "netcoreapp20_compat"
|
||||
_restoreAndPublish "netstandard2.0" $winRID "2.0.0" "netstandard20_compat"
|
||||
$restoreSources = -join("https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json;https://api.nuget.org/v3/index.json;https://dotnet.myget.org/F/dotnet-core/api/v3/index.json;", $localPackageSourcePath)
|
||||
|
||||
$compatPackageVersion = _getPackageVersion "Microsoft.Windows.Compatibility"
|
||||
$privatePackageVersion = _getPackageVersion "Microsoft.Private.CoreFx.NETCoreApp"
|
||||
|
||||
& $dotnetPath restore --packages $packagesCachePath /p:RestoreSources="$restoreSources" /p:TargetFramework=$targetFramework /p:CompatibilityPackageVersion=$compatPackageVersion /p:PrivateCorefxPackageVersion=$privatePackageVersion /p:RID=$rid $csprojPath
|
||||
|
||||
& $dotnetPath publish -r $rid /p:RestoreSources="$restoreSources" /p:TargetFramework=$targetFramework /p:CompatibilityPackageVersion=$compatPackageVersion /p:RuntimeFrameworkVersion=$runtimeFramework /p:PrivateCorefxPackageVersion=$privatePackageVersion /p:RID=$rid $csprojPath
|
||||
|
||||
$outputPath = -join($PSScriptRoot, "\bin\Debug\", $targetFramework, "\", $rid, "\publish\refs\")
|
||||
|
||||
if (!(Test-Path $outputPath))
|
||||
{
|
||||
Write-Error -Message (-join("There was an error while publishing for framework: ", $targetFramework))
|
||||
Exit;
|
||||
}
|
||||
|
||||
Write-Output (-join("Published succedded for: ", $targetFramework))
|
||||
|
||||
$refPath = -join($repoRoot, "\bin\ref\", $refDirName)
|
||||
|
||||
if (Test-Path $refPath)
|
||||
{
|
||||
Remove-Item $refPath -r -force
|
||||
}
|
||||
|
||||
New-Item $refPath -ItemType directory
|
||||
Copy-Item (-join($outputPath, "*")) $refPath
|
||||
|
||||
Reference in New Issue
Block a user