diff --git a/Build.proj b/Build.proj index 2d96f02056fe6..6352e423156b9 100644 --- a/Build.proj +++ b/Build.proj @@ -12,16 +12,6 @@ - - - - - - - @@ -36,12 +26,4 @@ - - - - - \ No newline at end of file diff --git a/eng/Signing.props b/eng/Signing.props index 5ebb3ba2c2e43..7def3013b8941 100644 --- a/eng/Signing.props +++ b/eng/Signing.props @@ -1,4 +1,4 @@ - + @@ -12,7 +12,7 @@ During post build signing, there are no packages to sign during SignFinalPackages. --> - true + true @@ -22,10 +22,6 @@ --> - - - - @@ -49,126 +45,32 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + false + + + + + + + + + + + + + + + diff --git a/eng/Subsets.props b/eng/Subsets.props index 43843ea213934..1c84edcdae34f 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props @@ -7,38 +7,24 @@ Examples: - ./build.sh CoreHost + ./build.sh host.native - This builds only the .NET Core Host. + This builds only the .NET host. - ./build.sh corehost installer.managed + ./build.sh libs+host.native - This builds the CoreHost and also the Managed installer portion (e.g. Microsoft.NET.HostModel) - projects. A space ' ' or '+' are the delimiters between multiple subsets to build. + This builds the .NET host and also the manged libraries portion. + A space ' ' or '+' are the delimiters between multiple subsets to build. - ./build.sh -test installer.tests + ./build.sh -test host.tests This builds and executes the installer test projects. (The '-test' argument is an Arcade SDK argument that indicates tests should be run. Otherwise, they'll only be built.) - - Quirks: - - This command looks useful, but doesn't work as expected: - - ./build.sh -test /p:Subset=CoreHost-Test # (Doesn't work!) - - Intuitively, this should build the host, build the tests, then run the tests on the freshly - built host. What actually happens is the tests run on a previously built host. This is because - the depproj, pkgproj, and installer subsets process the host artifacts, and those didn't - rebuild because those subsets were disabled. - - You can get around this limitation by running the corehost subset, manually copying host - artifacts to the test layout, then running the test subset. --> - clr+mono+libs+installer - mono+libs+installer + clr+mono+libs+host+packs + mono+libs+packs @@ -63,9 +49,11 @@ libs.native+libs.ref+libs.src+libs.pretest+libs.packages - corehost+installer.managed+installer.depprojs+installer.pkgprojs+bundles+installers+installer.tests - installer.pkgprojs - corehost+$(DefaultInstallerSubsets) + host.native+host.pkg+host.tools+host.tests + + host.native + + packs.product+packs.tests @@ -73,8 +61,8 @@ <_subset>$(_subset.Replace('+clr+', '+$(DefaultCoreClrSubsets)+')) <_subset>$(_subset.Replace('+mono+', '+$(DefaultMonoSubsets)+')) <_subset>$(_subset.Replace('+libs+', '+$(DefaultLibrariesSubsets)+')) - <_subset>$(_subset.Replace('+installer+', '+$(DefaultInstallerSubsets)+')) - <_subset>$(_subset.Replace('+installer.nocorehost+', '+$(DefaultInstallerSubsets.Replace('corehost+', ''))+')) + <_subset>$(_subset.Replace('+host+', '+$(DefaultHostSubsets)+')) + <_subset>$(_subset.Replace('+packs+', '+$(DefaultPacksSubsets)+')) <_subset>+$(_subset.Trim('+'))+ @@ -117,19 +105,21 @@ - - - - - - - - - - - + + + + + + + + + + + + + @@ -254,57 +244,62 @@ - - - - + + + + - + - - - - - - - - + - + - - - - - - + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 73c906cbd86c4..cbd6396574f27 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,10 +38,18 @@ https://github.com/dotnet/arcade 72b28b7e023d4c3fffa0a0b9748a7d4e8cc799be + + https://github.com/dotnet/arcade + 72b28b7e023d4c3fffa0a0b9748a7d4e8cc799be + https://github.com/dotnet/arcade 72b28b7e023d4c3fffa0a0b9748a7d4e8cc799be + + https://github.com/dotnet/arcade + 9a1e99f6c326a67297b074453e96bdd0cb36e7e3 + https://github.com/dotnet/arcade 72b28b7e023d4c3fffa0a0b9748a7d4e8cc799be diff --git a/eng/Versions.props b/eng/Versions.props index c3617745573a2..0163c8b6977ae 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -60,7 +60,9 @@ 6.0.0-beta.20552.5 6.0.0-beta.20552.5 2.5.1-beta.20552.5 + 6.0.0-beta.20552.5 6.0.0-beta.20552.5 + 6.0.0-beta.20562.3 6.0.0-beta.20552.5 6.0.0-beta.20552.5 diff --git a/eng/liveBuilds.targets b/eng/liveBuilds.targets index 097941761a364..8cbde5f233ea2 100644 --- a/eng/liveBuilds.targets +++ b/eng/liveBuilds.targets @@ -12,41 +12,6 @@ $(LibrariesTargetOS)-$(LibrariesConfiguration)-$(TargetArchitecture) - - - - $(RuntimeIdentifier) - $(ArtifactPlatform.Replace('win-', 'windows-')) - $(ArtifactPlatform.Replace('unix-', 'Unix-')) - $(ArtifactPlatform.Replace('linux-', 'Linux-')) - $(ArtifactPlatform.Replace('osx-', 'OSX-')) - $(ArtifactPlatform.Replace('freebsd-', 'FreeBSD-')) - $(ArtifactPlatform.Replace('netbsd-', 'NetBSD-')) - - $(ArtifactPlatform.Replace('-', '_')) - - $([MSBuild]::NormalizeDirectory('$(AllArtifactsDownloadPath)', 'CoreCLRProduct_$(ArtifactPlatform)_$(CoreCLRConfiguration)')) - $([MSBuild]::NormalizeDirectory('$(AllArtifactsDownloadPath)', 'MonoProduct_$(ArtifactPlatform)_$(MonoConfiguration)')) - $([MSBuild]::NormalizeDirectory('$(AllArtifactsDownloadPath)', 'libraries_bin_$(ArtifactPlatform)_$(LibrariesConfiguration)')) - - - * - - $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts', 'bin', 'coreclr', '$(CoreCLRTargetOS).$(TargetArchitecture).$(CoreCLRConfiguration)')) @@ -116,7 +81,7 @@ Include=" $(CoreCLRSharedFrameworkPdbDir)*.pdb; $(CoreCLRSharedFrameworkPdbDir)*.dbg; - $(CoreCLRSharedFrameworkPdbDir)*.dwarf" /> + $(CoreCLRSharedFrameworkPdbDir)*.dwarf" IsNative="true" /> runtime/$(CoreCLRCrossTargetComponentDirName)_$(TargetArchitecture)/native + true diff --git a/eng/pipelines/coreclr/perf.yml b/eng/pipelines/coreclr/perf.yml index a80e985fef1d3..cf06bfbf503bc 100644 --- a/eng/pipelines/coreclr/perf.yml +++ b/eng/pipelines/coreclr/perf.yml @@ -48,7 +48,7 @@ jobs: platforms: - Browser_wasm jobParameters: - buildArgs: -s mono+libs+installer -c $(_BuildConfig) + buildArgs: -s mono+libs+host+packs -c $(_BuildConfig) nameSuffix: wasm isOfficialBuild: ${{ variables.isOfficialBuild }} extraStepsTemplate: /eng/pipelines/common/upload-artifact-step.yml diff --git a/eng/pipelines/coreclr/templates/build-job.yml b/eng/pipelines/coreclr/templates/build-job.yml index beb779bc605b3..87e447a597963 100644 --- a/eng/pipelines/coreclr/templates/build-job.yml +++ b/eng/pipelines/coreclr/templates/build-job.yml @@ -123,11 +123,33 @@ jobs: - ${{ if eq(parameters.osGroup, 'windows') }}: - name: ninjaArg value: '-ninja' + + - name: SignType + value: $[ coalesce(variables.OfficialSignType, 'real') ] - ${{ parameters.variables }} steps: + # Install MicroBuild for signing the DAC and DBI + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - task: NuGetAuthenticate@0 + + - ${{ if eq(parameters.osGroup, 'windows') }}: + # NuGet's http cache lasts 30 minutes. If we're on a static machine, this may interfere with + # auto-update PRs by preventing the CI build from fetching the new version. Delete the cache. + - powershell: Remove-Item -Recurse -ErrorAction Ignore "$env:LocalAppData\NuGet\v3-cache" + displayName: Clear NuGet http cache (if exists) + + - task: MicroBuildSigningPlugin@2 + displayName: Install MicroBuild plugin for Signing + inputs: + signType: $(SignType) + zipSources: false + feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json + continueOnError: false + condition: and(succeeded(), in(variables['SignType'], 'real', 'test')) + # Install native dependencies # Linux builds use docker images with dependencies preinstalled, # and FreeBSD builds use a build agent with dependencies @@ -208,10 +230,15 @@ jobs: targetFolder: $(buildProductRootFolderPath)/sharedFramework overWrite: true - # Sign on Windows - - ${{ if and(eq(parameters.osGroup, 'windows'), eq(parameters.signBinaries, 'true'), ne(parameters.testGroup, 'clrTools')) }}: - - powershell: eng\common\build.ps1 -ci -sign -restore -configuration:$(buildConfig) -warnaserror:0 /p:ArcadeBuild=true /p:OfficialBuild=true /p:TargetOS=$(osGroup) /p:TargetArchitecture=$(archType) /p:Configuration=$(_BuildConfig) /p:DotNetSignType=$env:_SignType -projects $(Build.SourcesDirectory)\eng\empty.csproj - displayName: Sign Binaries + # Sign diagnostic files on Windows + - ${{ if and(eq(parameters.osGroup, 'windows'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(parameters.testGroup, 'clrTools')) }}: + - powershell: >- + eng\common\build.ps1 -ci -sign -restore -configuration:$(buildConfig) -warnaserror:0 + /p:DiagnosticsFilesRoot="$(buildProductRootFolderPath)" + /p:SignDiagnostics=true + /p:DotNetSignType=$(SignType) + -projects $(Build.SourcesDirectory)\eng\empty.csproj + displayName: Sign Diagnostic Binaries - task: PublishPipelineArtifact@1 displayName: Publish Signing Logs diff --git a/eng/pipelines/coreclr/templates/crossdac-build.yml b/eng/pipelines/coreclr/templates/crossdac-build.yml index 216485692c649..0fe26d160ba16 100644 --- a/eng/pipelines/coreclr/templates/crossdac-build.yml +++ b/eng/pipelines/coreclr/templates/crossdac-build.yml @@ -5,16 +5,12 @@ parameters: steps: # Always build the crossdac, that way we know in CI/PR if things break to build. - - ${{ if eq(parameters.osGroup, 'windows') }}: - - ${{ if notin(parameters.archType, 'x86') }}: - - script: set __TestIntermediateDir=int&&$(Build.SourcesDirectory)/src/coreclr/build-runtime$(scriptExt) $(buildConfig) $(archType) -ci -linuxdac $(officialBuildIdArg) - displayName: Build Cross OS Linux DAC for Windows + - ${{ if and(eq(parameters.osGroup, 'windows'), notin(parameters.archType, 'x86')) }}: + - script: set __TestIntermediateDir=int&&$(Build.SourcesDirectory)/src/coreclr/build-runtime$(scriptExt) $(buildConfig) $(archType) -ci -linuxdac $(officialBuildIdArg) + displayName: Build Cross OS Linux DAC for Windows - - - ${{ if eq(parameters.osGroup, 'windows') }}: - - ${{ if notin(parameters.archType, 'x86') }}: - - script: set __TestIntermediateDir=int&&$(Build.SourcesDirectory)/src/coreclr/build-runtime$(scriptExt) $(buildConfig) $(archType) -ci -alpinedac $(officialBuildIdArg) - displayName: Build Cross OS Linux-musl DAC for Windows + - script: set __TestIntermediateDir=int&&$(Build.SourcesDirectory)/src/coreclr/build-runtime$(scriptExt) $(buildConfig) $(archType) -ci -alpinedac $(officialBuildIdArg) + displayName: Build Cross OS Linux-musl DAC for Windows - task: CopyFiles@2 displayName: Gather CrossDac Artifacts (Linux) @@ -34,6 +30,23 @@ steps: !**/sharedFramework/**/* TargetFolder: '$(buildMuslDacStagingPath)' + # Sign diagnostic files on Windows + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - powershell: >- + eng\common\build.ps1 -ci -sign -restore -configuration:$(buildConfig) -warnaserror:0 + /p:DiagnosticsFilesRoot="$(buildLinuxDacStagingPath)" + /p:SignDiagnostics=true + /p:DotNetSignType=$(SignType) + -projects $(Build.SourcesDirectory)\eng\empty.csproj + displayName: Sign Linux CrossDac + - powershell: >- + eng\common\build.ps1 -ci -sign -restore -configuration:$(buildConfig) -warnaserror:0 + /p:DiagnosticsFilesRoot="$(buildMuslDacStagingPath)" + /p:SignDiagnostics=true + /p:DotNetSignType=$(SignType) + -projects $(Build.SourcesDirectory)\eng\empty.csproj + displayName: Sign Linux-musl CrossDac + - ${{ if eq(parameters.osGroup, 'Linux') }}: - task: CopyFiles@2 displayName: Gather runtime for CrossDac diff --git a/eng/pipelines/installer/jobs/base-job.yml b/eng/pipelines/installer/jobs/base-job.yml index 64d4da38f09d4..50db8eeaacd24 100644 --- a/eng/pipelines/installer/jobs/base-job.yml +++ b/eng/pipelines/installer/jobs/base-job.yml @@ -21,19 +21,13 @@ parameters: packageDistroList: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-14.04-debpkg-e5cf912-20175003025046 - imageRid: ubuntu.14.04 - rids: [] + packageType: deb + packagingArgs: /p:BuildDebPackage=true - image: mcr.microsoft.com/dotnet-buildtools/prereqs:rhel-7-rpmpkg-c982313-20174116044113 - imageRid: rhel.7 - rids: - - centos.7 - - fedora.27 - - opensuse.42 - - oraclelinux.7 - - sles.12 + packageType: rpm + packagingArgs: /p:BuildRpmPackage=true isOfficialBuild: false - useOfficialAllConfigurations: false buildFullPlatformManifest: false liveRuntimeBuildConfig: '' @@ -117,7 +111,7 @@ jobs: - name: BaseJobBuildCommand value: >- - build.cmd -subset installer -ci + build.cmd -subset host+packs -ci $(BuildAction) -configuration $(_BuildConfig) $(LiveOverridePathArgs) @@ -155,7 +149,7 @@ jobs: - name: BaseJobBuildCommand value: >- - $(Build.SourcesDirectory)/build.sh -subset installer -ci + $(Build.SourcesDirectory)/build.sh -subset packs -ci $(BuildAction) -configuration $(_BuildConfig) -os ${{ parameters.osGroup }} @@ -191,7 +185,7 @@ jobs: - ${{ if eq(parameters.isOfficialBuild, true) }}: - name: BuildScript - value: ./eng/install-nuget-credprovider-then-build.sh --subset installer + value: ./eng/install-nuget-credprovider-then-build.sh --subset host+packs - name: MSBuildScript value: /root/runtime/eng/install-nuget-credprovider-then-msbuild.sh @@ -217,7 +211,7 @@ jobs: - name: BuildArguments value: >- - -subset installer -ci + -subset host+packs -ci $(BuildAction) /p:CrossBuild=${{ parameters.crossBuild }} /p:PortableBuild=$(_PortableBuild) @@ -233,23 +227,15 @@ jobs: $(OutputRidArg) /bl:msbuild.publish.binlog - # Tell the build to package up the bits from the portable build. - - name: PackagePortableBitsArgs - value: >- - /p:PortableBuild=false - /p:SharedFrameworkPublishDir=/root/sharedFrameworkPublish/ - /p:InstallerSourceOSPlatformConfig=linux-x64.$(_BuildConfig) - - name: DockerRunMSBuild value: >- docker run -v $(Build.SourcesDirectory):/root/runtime - -v $(Build.StagingDirectory)/sharedFrameworkPublish/:/root/sharedFrameworkPublish/ -w=/root/runtime $(PreserveNuGetAuthDockerArgs) - name: installersSubsetArg - value: --subset Installers + value: --subset packs.installers - name: BaseJobBuildCommand value: | @@ -265,26 +251,16 @@ jobs: value: >- $(RuntimeArtifactsArgs) $(LibrariesConfigurationArg) - $(LibrariesAllConfigurationsOverridePathArg) - $(AllArtifactsArgs) - name: RuntimeArtifactsArgs value: '' - name: LibrariesConfigurationArg value: '' - - name: LibrariesAllConfigurationsOverridePathArg - value: '' - - name: AllArtifactsArgs - value: '' - name: RuntimeDownloadPath value: '' - name: LibrariesDownloadPath value: '' - - name: LibrariesDownloadPathAllConfigurations - value: '' - - name: AllArtifactsDownloadPath - value: '' - ${{ if ne(parameters.liveRuntimeBuildConfig, '') }}: - name: liveRuntimeLegName @@ -316,60 +292,23 @@ jobs: - name: LibrariesConfigurationArg value: ' /p:LibrariesConfiguration=${{ parameters.liveLibrariesBuildConfig }}' - # Download allconfigurations bits to a separate location. It overlaps with the live libraries - # download and causes conflict when unzipping to the same location. - - ${{ if eq(parameters.useOfficialAllConfigurations, true) }}: - - name: LibrariesDownloadPathAllConfigurations - value: 'artifacts/transport/librariesallconfigurations' - - name: LibrariesAllConfigurationsOverridePathArg - value: /p:LibrariesAllConfigurationsOverridePath=${{ parameters.buildCommandSourcesDirectory }}$(LibrariesDownloadPathAllConfigurations) - - name: LibrariesArtifactNameAllConfigurations - value: libraries_bin_official_allconfigurations - - # Download all upstream platforms and incorporate in the platform manifest. - - ${{ if eq(parameters.buildFullPlatformManifest, true) }}: - - name: AllArtifactsDownloadPath - value: 'artifacts/transport/AllArtifacts' - - name: AllArtifactsArgs - value: >- - /p:AllArtifactsDownloadPath=${{ parameters.buildCommandSourcesDirectory }}$(AllArtifactsDownloadPath) - /p:BuildFullPlatformManifest=true - dependsOn: - checkout - ${{ parameters.dependsOn }} - - ${{ if eq(parameters.dependsOnGlobalBuild, false) }}: - - ${{ if ne(parameters.liveRuntimeBuildConfig, '') }}: - - ${{ format('{0}_{1}_product_build_{2}{3}_{4}_{5}', - parameters.runtimeFlavor, - parameters.runtimeVariant, - parameters.osGroup, - parameters.osSubgroup, - parameters.archType, - parameters.liveRuntimeBuildConfig) }} - - ${{ if ne(parameters.liveLibrariesBuildConfig, '') }}: - - libraries_build_${{ format('{0}{1}_{2}_{3}', - parameters.osGroup, - parameters.osSubgroup, - parameters.archType, - parameters.liveLibrariesBuildConfig) }} - - ${{ if eq(parameters.useOfficialAllConfigurations, true) }}: - - libraries_build_allconfigurations_windows_x64_Release - - ${{ if eq(parameters.buildFullPlatformManifest, true) }}: - - ${{ each platform in parameters.platforms }}: - - ${{ parameters.runtimeFlavor }}_${{ parameters.runtimeVariant }}_product_build_${{ platform }}_${{ parameters.liveRuntimeBuildConfig }} - - libraries_build_${{ platform }}_${{ parameters.liveLibrariesBuildConfig }} - - - ${{ if eq(parameters.dependsOnGlobalBuild, true) }}: - - ${{ if ne(parameters.liveRuntimeBuildConfig, '') }}: - - ${{ format('build_{0}{1}_{2}_{3}_{4}', - parameters.osGroup, - parameters.osSubgroup, - parameters.archType, - parameters.liveRuntimeBuildConfig, - parameters.globalBuildSuffix) }} - - ${{ if eq(parameters.useOfficialAllConfigurations, true) }}: - - build_windows_x64_${{ parameters.liveLibrariesBuildConfig }}_AllConfigurations + - ${{ if ne(parameters.liveRuntimeBuildConfig, '') }}: + - ${{ format('{0}_{1}_product_build_{2}{3}_{4}_{5}', + parameters.runtimeFlavor, + parameters.runtimeVariant, + parameters.osGroup, + parameters.osSubgroup, + parameters.archType, + parameters.liveRuntimeBuildConfig) }} + - ${{ if ne(parameters.liveLibrariesBuildConfig, '') }}: + - libraries_build_${{ format('{0}{1}_{2}_{3}', + parameters.osGroup, + parameters.osSubgroup, + parameters.archType, + parameters.liveLibrariesBuildConfig) }} steps: @@ -408,36 +347,6 @@ jobs: - template: /eng/pipelines/common/clone-checkout-bundle-step.yml - # Download and extract artifacts for earlier subsets. - - task: DownloadBuildArtifacts@0 - displayName: 'Download artifacts for all platforms' - inputs: - buildType: current - downloadType: specific - downloadPath: '$(Build.SourcesDirectory)/__download__/AllPlatforms/' - allowPartiallySucceededBuilds: true - itemPattern: | - $(runtimeFlavorName)Product_*/** - libraries_bin_*/** - !*Logs* - - - ${{ if eq(parameters.buildFullPlatformManifest, true) }}: - - ${{ each platform in parameters.platforms }}: - - task: ExtractFiles@1 - displayName: 'Unzip $(runtimeFlavorName) artifacts: ${{ platform }}' - inputs: - archiveFilePatterns: | - $(Build.SourcesDirectory)/__download__/AllPlatforms/**/$(runtimeFlavorName)Product_${{ platform }}_${{ parameters.liveRuntimeBuildConfig }}.* - destinationFolder: $(AllArtifactsDownloadPath)/$(runtimeFlavorName)Product_${{ platform }}_${{ parameters.liveRuntimeBuildConfig }}/ - cleanUnpackFolder: false - - task: ExtractFiles@1 - displayName: 'Unzip Libraries artifacts: ${{ platform }}' - inputs: - archiveFilePatterns: | - $(Build.SourcesDirectory)/__download__/AllPlatforms/**/libraries_bin_${{ platform }}_${{ parameters.liveLibrariesBuildConfig }}.* - destinationFolder: $(AllArtifactsDownloadPath)/libraries_bin_${{ platform }}_${{ parameters.liveLibrariesBuildConfig }}/ - cleanUnpackFolder: false - - ${{ if ne(parameters.liveRuntimeBuildConfig, '') }}: - template: /eng/pipelines/common/download-artifact-step.yml parameters: @@ -455,16 +364,6 @@ jobs: displayName: 'Libraries artifacts' cleanUnpackFolder: false - - ${{ if eq(parameters.useOfficialAllConfigurations, true) }}: - - template: /eng/pipelines/common/download-artifact-step.yml - parameters: - unpackFolder: $(Build.SourcesDirectory)/$(LibrariesDownloadPathAllConfigurations) - # Always use '.zip' because AllConfigurations is built on Windows but used everywhere. - artifactFileName: '$(LibrariesArtifactNameAllConfigurations).zip' - artifactName: '$(LibrariesArtifactNameAllConfigurations)' - displayName: 'Libraries artifacts (AllConfigurations)' - cleanUnpackFolder: false - - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS') }}: - script: $(Build.SourcesDirectory)/eng/install-native-dependencies.sh ${{ parameters.osGroup }} ${{ parameters.archType }} azDO displayName: Install Build Dependencies @@ -481,7 +380,7 @@ jobs: # Build corehost, sign and add entitlements to MacOS binaries - ${{ if eq(parameters.osGroup, 'OSX') }}: - - script: $(BaseJobBuildCommand) -subset corehost + - script: $(BaseJobBuildCommand) -subset host.native displayName: Build CoreHost - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: @@ -495,7 +394,7 @@ jobs: path: $(Build.SourcesDirectory)/artifacts/bin/osx-${{ parameters.archType }}.$(_BuildConfig)/corehost entitlementsFile: $(Build.SourcesDirectory)/eng/pipelines/common/entitlements.plist - - script: $(BaseJobBuildCommand) -subset installer.nocorehost + - script: $(BaseJobBuildCommand) -subset host.pkg+host.tools+packs displayName: Build and Package - ${{ if in(parameters.osGroup, 'OSX', 'iOS','tvOS') }}: @@ -506,33 +405,17 @@ jobs: # Only in glibc leg, we produce RPMs and Debs - ${{ if and(eq(parameters.runtimeFlavor, 'coreclr'), eq(parameters.platform, 'Linux_x64'), eq(parameters.osSubgroup, ''))}}: - - task: CopyFiles@2 - displayName: 'Copy built Portable linux-x64 binaries to staging directory' - inputs: - SourceFolder: '$(Build.SourcesDirectory)/artifacts/obj/linux-x64.$(_BuildConfig)/sharedFrameworkPublish' - TargetFolder: '$(Build.StagingDirectory)/sharedFrameworkPublish' - - ${{ each packageBuild in parameters.packageDistroList }}: # This leg's RID matches the build image. Build its distro-dependent packages, as well as # the distro-independent installers. (There's no particular reason to build the distro- # independent installers on this leg, but we need to do it somewhere.) - template: steps/build-linux-package.yml parameters: - distroRid: ${{ packageBuild.imageRid }} + packageType: ${{ packageBuild.packageType }} image: ${{ packageBuild.image }} packageStepDescription: Runtime Deps, Runtime, Framework Packs installers subsetArg: $(installersSubsetArg) - - - ${{ each rid in packageBuild.rids }}: - # Build distro-dependent packages. - - template: steps/build-linux-package.yml - parameters: - distroRid: ${{ rid }} - image: ${{ packageBuild.image }} - outputRidArg: /p:OutputRid=${{ rid }}-${{ parameters.archType }} - packageStepDescription: Runtime Deps installers - packagingArgs: /p:BuildDistroIndependentInstallers=false - subsetArg: $(installersSubsetArg) + packagingArgs: ${{ packageBuild.packagingArgs }} - ${{ if ne(parameters.container, '') }}: # Files may be owned by root because builds don't set user ID. Later build steps run 'find' in diff --git a/eng/pipelines/installer/jobs/steps/build-linux-package.yml b/eng/pipelines/installer/jobs/steps/build-linux-package.yml index e0129ccff6317..95bae9624037a 100644 --- a/eng/pipelines/installer/jobs/steps/build-linux-package.yml +++ b/eng/pipelines/installer/jobs/steps/build-linux-package.yml @@ -1,7 +1,6 @@ parameters: - distroRid: null + packageType: null image: null - outputRidArg: '' packageStepDescription: null packagingArgs: '' subsetArg: '' @@ -13,12 +12,8 @@ steps: $(DockerRunMSBuild) ${{ parameters.image }} $(BuildScript) \ --ci \ ${{ parameters.subsetArg }} \ - /p:UsePrebuiltPortableBinariesForInstallers=true \ - $(PackagePortableBitsArgs) \ - /p:GenerateProjectInstallers=true \ ${{ parameters.packagingArgs }} \ $(CommonMSBuildArgs) \ - ${{ parameters.outputRidArg }} \ $(LiveOverridePathArgs) \ - /bl:artifacts/log/$(_BuildConfig)/msbuild.${{ parameters.distroRid }}.installers.binlog - displayName: Package ${{ parameters.packageStepDescription }} - ${{ parameters.distroRid }} + /bl:artifacts/log/$(_BuildConfig)/msbuild.${{ parameters.packageType }}.installers.binlog + displayName: Package ${{ parameters.packageStepDescription }} - ${{ parameters.packageType }} diff --git a/eng/pipelines/official/jobs/prepare-signed-artifacts.yml b/eng/pipelines/official/jobs/prepare-signed-artifacts.yml index 7b0eba0b5cd02..121644bfaa692 100644 --- a/eng/pipelines/official/jobs/prepare-signed-artifacts.yml +++ b/eng/pipelines/official/jobs/prepare-signed-artifacts.yml @@ -44,7 +44,7 @@ jobs: - script: >- build.cmd -ci - -subset installer.publish + -subset publish -configuration Release /p:PublishRidAgnosticPackagesFromPlatform=${{ parameters.PublishRidAgnosticPackagesFromPlatform }} /p:OfficialBuildId=$(Build.BuildNumber) diff --git a/eng/pipelines/runtime-official.yml b/eng/pipelines/runtime-official.yml index 91e85294cfbe9..3a3c7954c267b 100644 --- a/eng/pipelines/runtime-official.yml +++ b/eng/pipelines/runtime-official.yml @@ -116,7 +116,7 @@ stages: # - windows_arm # - windows_arm64 jobParameters: - buildArgs: -s mono+libs+installer -c $(_BuildConfig) + buildArgs: -s mono+libs+host+packs -c $(_BuildConfig) nameSuffix: AllSubsets_Mono isOfficialBuild: ${{ variables.isOfficialBuild }} extraStepsTemplate: /eng/pipelines/common/upload-unsigned-artifacts-step.yml @@ -145,7 +145,7 @@ stages: buildConfig: release runtimeFlavor: mono jobParameters: - buildArgs: -s mono+libs+installer -c $(_BuildConfig) + buildArgs: -s mono+libs+host+packs -c $(_BuildConfig) /p:MonoEnableLLVM=true /p:MonoBundleLLVMOptimizer=false nameSuffix: AllSubsets_Mono_LLVMJIT runtimeVariant: LLVMJIT @@ -158,7 +158,7 @@ stages: buildConfig: release runtimeFlavor: mono jobParameters: - buildArgs: -s mono+libs+installer -c $(_BuildConfig) + buildArgs: -s mono+libs+host+packs -c $(_BuildConfig) /p:MonoEnableLLVM=true /p:MonoBundleLLVMOptimizer=true nameSuffix: AllSubsets_Mono_LLVMAOT runtimeVariant: LLVMAOT @@ -215,8 +215,6 @@ stages: liveRuntimeBuildConfig: release liveLibrariesBuildConfig: Release isOfficialBuild: ${{ variables.isOfficialBuild }} - useOfficialAllConfigurations: true - buildFullPlatformManifest: true platforms: - OSX_arm64 - OSX_x64 diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index dd43cb33606d6..e84d08e83ef47 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -271,7 +271,7 @@ jobs: jobParameters: testGroup: innerloop nameSuffix: AllSubsets_Mono - buildArgs: -s mono+libs+installer -c $(_BuildConfig) + buildArgs: -s mono+libs+host+packs -c $(_BuildConfig) condition: >- or( eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true), @@ -292,7 +292,7 @@ jobs: jobParameters: testGroup: innerloop nameSuffix: AllSubsets_Mono - buildArgs: -s mono+libs+installer -c $(_BuildConfig) + buildArgs: -s mono+libs+host+packs -c $(_BuildConfig) condition: >- or( eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true), @@ -320,7 +320,7 @@ jobs: jobParameters: testGroup: innerloop nameSuffix: AllSubsets_Mono - buildArgs: -s mono+libs+installer+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true + buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true timeoutInMinutes: 120 condition: >- or( @@ -365,7 +365,7 @@ jobs: jobParameters: testGroup: innerloop nameSuffix: AllSubsets_Mono - buildArgs: -s mono+libs+installer+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true + buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true timeoutInMinutes: 120 condition: >- or( @@ -473,7 +473,7 @@ jobs: jobParameters: testGroup: innerloop nameSuffix: AllSubsets_Mono_LLVMJIT - buildArgs: -s mono+libs+installer -c $(_BuildConfig) + buildArgs: -s mono+libs+host+packs -c $(_BuildConfig) /p:MonoEnableLLVM=true /p:MonoBundleLLVMOptimizer=false condition: >- or( @@ -493,7 +493,7 @@ jobs: jobParameters: testGroup: innerloop nameSuffix: AllSubsets_Mono_LLVMJIT - buildArgs: -s mono+libs+installer -c $(_BuildConfig) + buildArgs: -s mono+libs+host+packs -c $(_BuildConfig) /p:MonoEnableLLVM=true /p:MonoBundleLLVMOptimizer=false condition: >- or( @@ -516,7 +516,7 @@ jobs: jobParameters: testGroup: innerloop nameSuffix: AllSubsets_Mono_LLVMAOT - buildArgs: -s mono+libs+installer -c $(_BuildConfig) + buildArgs: -s mono+libs+host+packs -c $(_BuildConfig) /p:MonoEnableLLVM=true /p:MonoBundleLLVMOptimizer=true condition: >- or( @@ -535,7 +535,7 @@ jobs: jobParameters: testGroup: innerloop nameSuffix: AllSubsets_Mono_LLVMAOT - buildArgs: -s mono+libs+installer -c $(_BuildConfig) + buildArgs: -s mono+libs+host+packs -c $(_BuildConfig) /p:MonoEnableLLVM=true /p:MonoBundleLLVMOptimizer=true condition: >- or( diff --git a/eng/pipelines/runtimelab.yml b/eng/pipelines/runtimelab.yml index 38425c1407e93..dc205da3682b1 100644 --- a/eng/pipelines/runtimelab.yml +++ b/eng/pipelines/runtimelab.yml @@ -71,7 +71,7 @@ stages: jobParameters: timeoutInMinutes: 100 testGroup: innerloop - buildArgs: -s clr+libs+installer -c debug -runtimeConfiguration Checked + buildArgs: -s clr+libs+host+packs -c debug -runtimeConfiguration Checked extraStepsTemplate: /eng/pipelines/runtimelab/runtimelab-post-build-steps.yml extraStepsParameters: uploadRuntimeTests: true @@ -94,7 +94,7 @@ stages: uploadLibrariesTests: ${{ eq(variables.isOfficialBuild, false) }} uploadUnsignedArtifacts: false ${{ if eq(variables.isOfficialBuild, false) }}: - buildArgs: -s clr+libs+libs.tests+installer -c $(_BuildConfig) /p:ArchiveTests=true + buildArgs: -s clr+libs+libs.tests+host+packs -c $(_BuildConfig) /p:ArchiveTests=true ${{ if eq(variables.isOfficialBuild, true) }}: buildArgs: -s clr+libs -c $(_BuildConfig) diff --git a/global.json b/global.json index 31ac6fc0ef7c6..2dd857c94fd16 100644 --- a/global.json +++ b/global.json @@ -16,6 +16,7 @@ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20552.5", "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "6.0.0-beta.20552.5", "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.20560.1", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.20552.5", "Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "5.0.0-preview.8.20359.4", "Microsoft.Build.NoTargets": "2.0.1", diff --git a/src/installer/Directory.Build.props b/src/installer/Directory.Build.props index 319906aef6544..c7fa3122d8509 100644 --- a/src/installer/Directory.Build.props +++ b/src/installer/Directory.Build.props @@ -107,10 +107,6 @@ $(ArtifactsShippingPackagesDir) $(ArtifactsShippingPackagesDir) - - - $(IntermediateOutputRootPath)sharedFrameworkPublish/ - $(IntermediateOutputRootPath)sharedFrameworkPublish.symbols\ diff --git a/src/installer/managed/CommonManaged.props b/src/installer/managed/CommonManaged.props index c96859a92e4a5..957ee4710e206 100644 --- a/src/installer/managed/CommonManaged.props +++ b/src/installer/managed/CommonManaged.props @@ -3,6 +3,7 @@ true + true $(MajorVersion).$(MinorVersion).$(PatchVersion) $(VersionPrefix) true diff --git a/src/installer/pkg/Directory.Build.props b/src/installer/pkg/Directory.Build.props index 9f4442493b677..e2ffe40718bd1 100644 --- a/src/installer/pkg/Directory.Build.props +++ b/src/installer/pkg/Directory.Build.props @@ -6,11 +6,6 @@ $(BaseOutputRootPath)corehost - - - false - - $(RepoRoot)LICENSE.TXT $(RepoRoot)THIRD-PARTY-NOTICES.TXT @@ -28,45 +23,6 @@ true - - $(IntermediateOutputRootPath)packages/ - - $(MSBuildThisFileDirectory)packaging/rpm/templates/ - - - $(ArtifactsBinDir)dotnet-deb-tool\ - $(DebToolBinDir)$(Configuration)\$(NetCoreAppCurrent)\dotnet-deb-tool.dll - $(RepoRoot)tools-local/dotnet-deb-tool/ - - true - true - true - - true - true - true - - - true - - - $(OSPlatformConfig) - - diff --git a/src/installer/pkg/packaging/Directory.Build.props b/src/installer/pkg/packaging/Directory.Build.props deleted file mode 100644 index 61f4f4d515aa6..0000000000000 --- a/src/installer/pkg/packaging/Directory.Build.props +++ /dev/null @@ -1,20 +0,0 @@ - - - - - $(InstallerProjectRoot)pkg/packaging/ - - - $(BuildDistroIndependentInstallers) - $(BuildDistroIndependentInstallers) - - - $(IntermediateOutputRootPath)sharedHost/ - $(IntermediateOutputRootPath)hostFxr/ - $(IntermediateOutputRootPath)sharedFx/ - $(IntermediateOutputRootPath)combined-framework-host/ - $(IntermediateOutputRootPath)nethost/ - $(IntermediateOutputRootPath)crossgen2/ - - - diff --git a/src/installer/pkg/packaging/deb/dotnet-hostfxr-debian_config.json b/src/installer/pkg/packaging/deb/dotnet-hostfxr-debian_config.json deleted file mode 100644 index ba7090e7ebb79..0000000000000 --- a/src/installer/pkg/packaging/deb/dotnet-hostfxr-debian_config.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "maintainer_name":".NET Team", - "maintainer_email": "dotnetpackages@dotnetfoundation.org", - - "package_name": "%HOSTFXR_DEBIAN_PACKAGE_NAME%", - "install_root": "/usr/share/dotnet", - - "short_description": "%HOSTFXR_BRAND_NAME% %HOSTFXR_NUGET_VERSION%", - "long_description": ".NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs.", - "homepage": "https://dot.net/core", - - "release":{ - "package_version":"1.0.0.0", - "package_revision":"%HOSTFXR_REVISION%", - "urgency" : "low", - "changelog_message" : "https://github.com/dotnet/core/tree/master/release-notes" - }, - - "control": { - "priority":"standard", - "section":"libs", - "architecture":"amd64" - }, - - "copyright": "2017 Microsoft", - "license": { - "type": "MIT and ASL 2.0 and BSD", - "full_text": "Copyright (c) 2017 Microsoft\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE." - }, - - "debian_dependencies":{ - "dotnet-host" : { - "package_version": "%SHARED_HOST_DEBIAN_VERSION%" - }, - "libc6":{}, - "libgcc1":{}, - "libstdc++6":{} - } -} diff --git a/src/installer/pkg/packaging/deb/dotnet-runtime-deps-debian_config.json b/src/installer/pkg/packaging/deb/dotnet-runtime-deps-debian_config.json deleted file mode 100644 index ee2554263cf81..0000000000000 --- a/src/installer/pkg/packaging/deb/dotnet-runtime-deps-debian_config.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "maintainer_name":".NET Team", - "maintainer_email": "dotnetpackages@dotnetfoundation.org", - - "package_name": "%RUNTIME_DEPS_DEBIAN_PACKAGE_NAME%", - "install_root": "/usr/share/dotnet", - - "short_description": "%RUNTIME_DEPS_DEBIAN_PACKAGE_NAME% %RUNTIME_DEPS_VERSION%", - "long_description": ".NET is a development platform that you can use to build command-line applications, microservices and modern websites. This package installs all the system dependencies for .NET Runtime.", - "homepage": "https://dot.net/core", - - "release":{ - "package_version":"1.0.0.0", - "package_revision":"%RUNTIME_DEPS_REVISION%", - "urgency" : "low", - "changelog_message" : "https://github.com/dotnet/core/tree/master/release-notes" - }, - - "control": { - "priority":"standard", - "section":"libs", - "architecture":"amd64" - }, - - "copyright": "2018 Microsoft", - "license": { - "type": "MIT and ASL 2.0 and BSD", - "full_text": "Copyright (c) 2018 Microsoft\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE." - }, - - "debian_dependencies":{ - "libc6":{}, - "libgcc1":{}, - "libgssapi-krb5-2":{}, - "libstdc++6":{}, - "zlib1g":{}, - "%SSL_DEPENDENCY_LIST%" : {}, - "%LIBICU_DEPENDENCY_LIST%": {} - }, - - "debian_ignored_dependencies" : [ - "liblldb-3.5", - "liblldb-3.6" - ] -} diff --git a/src/installer/pkg/packaging/deb/dotnet-sharedframework-debian_config.json b/src/installer/pkg/packaging/deb/dotnet-sharedframework-debian_config.json deleted file mode 100644 index b2d78ab93be6d..0000000000000 --- a/src/installer/pkg/packaging/deb/dotnet-sharedframework-debian_config.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "maintainer_name":".NET Team", - "maintainer_email": "dotnetpackages@dotnetfoundation.org", - - "package_name": "%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME%", - "install_root": "/usr/share/dotnet", - - "short_description": "%SHARED_FRAMEWORK_BRAND_NAME% %SHARED_FRAMEWORK_NUGET_NAME% %SHARED_FRAMEWORK_NUGET_VERSION%", - "long_description": ".NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs.", - "homepage": "https://dot.net/core", - - "release":{ - "package_version":"1.0.0.0", - "package_revision":"%SHARED_FRAMEWORK_REVISION%", - "urgency" : "low", - "changelog_message" : "https://github.com/dotnet/core/tree/master/release-notes" - }, - - "control": { - "priority":"standard", - "section":"libs", - "architecture":"amd64" - }, - - "copyright": "2017 Microsoft", - "license": { - "type": "MIT and ASL 2.0 and BSD", - "full_text": "Copyright (c) 2017 Microsoft\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE." - }, - - "debian_dependencies":{ - "%HOSTFXR_DEBIAN_PACKAGE_NAME%" : { - "package_version": "%HOSTFXR_NUGET_VERSION%" - }, - "%RUNTIME_DEPS_DEBIAN_PACKAGE_NAME%" : { - "package_version": "%RUNTIME_DEPS_VERSION%" - } - } -} diff --git a/src/installer/pkg/packaging/deb/dotnet-sharedhost-debian_config.json b/src/installer/pkg/packaging/deb/dotnet-sharedhost-debian_config.json deleted file mode 100644 index dde2c2e3ac9ce..0000000000000 --- a/src/installer/pkg/packaging/deb/dotnet-sharedhost-debian_config.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "maintainer_name":".NET Team", - "maintainer_email": "dotnetpackages@dotnetfoundation.org", - - "package_name": "dotnet-host", - "install_root": "/usr/share/dotnet", - - "short_description": "%SHARED_HOST_BRAND_NAME%", - "long_description": ".NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs.", - "homepage": "https://dot.net/core", - - "release":{ - "package_version":"1.0.0.0", - "package_revision":"%SHARED_HOST_REVISION%", - "urgency" : "low", - "changelog_message" : "https://github.com/dotnet/core/tree/master/release-notes" - }, - - "control": { - "priority":"standard", - "section":"libs", - "architecture":"amd64" - }, - - "copyright": "2017 Microsoft", - "license": { - "type": "MIT and ASL 2.0 and BSD", - "full_text": "Copyright (c) 2017 Microsoft\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE." - }, - - "debian_dependencies":{ - "libc6":{}, - "libgcc1":{}, - "libstdc++6":{} - }, - - "package_conflicts" : [ - "dotnet", - "dotnet-nightly" - ], - - "symlinks": { - "dotnet" : "/usr/bin/dotnet" - } -} diff --git a/src/installer/pkg/packaging/deb/package.props b/src/installer/pkg/packaging/deb/package.props deleted file mode 100644 index 6ba97aaf68038..0000000000000 --- a/src/installer/pkg/packaging/deb/package.props +++ /dev/null @@ -1,8 +0,0 @@ - - - - $(PackagingRoot)deb/ - dotnet-host - $(SharedHostDebPkgName.ToLower()) - - \ No newline at end of file diff --git a/src/installer/pkg/packaging/deb/package.targets b/src/installer/pkg/packaging/deb/package.targets deleted file mode 100644 index da9b8feffc320..0000000000000 --- a/src/installer/pkg/packaging/deb/package.targets +++ /dev/null @@ -1,358 +0,0 @@ - - - - - - - - debian_config.json - - - - - - - - - - - $(SharedHostDebPkgName) - $(HostPackageVersion) - $(SharedHostPublishRoot) - $(SharedHostInstallerFile) - dotnet-sharedhost-debian_config.json - $(debPackaginfConfigPath)$(ConfigJsonName) - $(PackagesIntermediateDir)$(DebPackageName)/$(DebPackageVersion) - - - - $(debIntermediatesDir)/debianLayoutDirectory/ - $(debLayoutDirectory)$ - $(debLayoutDirectory)package_root - $(debLayoutDirectory)samples - $(debLayoutDirectory)docs - - - - - - - - - - - - - - - - - - - - - - - - - - $(SharedHostBrandName) - - - $(HostPackageRelease) - - - - - - - - - - - - - - - - - - - - - - $(HostFxrDebPkgName) - $(HostResolverPackageVersion) - $(HostFxrPublishRoot) - $(HostFxrInstallerFile) - dotnet-hostfxr-debian_config.json - $(debPackaginfConfigPath)$(ConfigJsonName) - $(PackagesIntermediateDir)$(DebPackageName)/$(DebPackageVersion) - - - - $(debIntermediatesDir)/debianLayoutDirectory/ - $(debLayoutDirectory)$ - $(debLayoutDirectory)package_root - $(debLayoutDirectory)samples - $(debLayoutDirectory)docs - - - - - - - - - - - - - - - - - - - - - - - - $(HostFxrBrandName) - - - $(HostPackageVersion) - - - $(HostResolverPackageVersion) - - - $(DebPackageName) - - - $(HostResolverPackageRelease) - - - - - - - - - - - - - - - - - - - - - - - $(SharedFxDebPkgName) - $(RuntimePackageVersion) - $(SharedFrameworkPublishRoot) - $(SharedFrameworkInstallerFile) - dotnet-sharedframework-debian_config.json - $(debPackaginfConfigPath)$(ConfigJsonName) - $(PackagesIntermediateDir)$(DebPackageName)/$(DebPackageVersion) - - - - $(debIntermediatesDir)/debianLayoutDirectory/ - $(debLayoutDirectory)$ - $(debLayoutDirectory)package_root - $(debLayoutDirectory)samples - $(debLayoutDirectory)docs - - - - - - - - - - - - - - - - - - - - - - - - $(HostFxrDebPkgName) - - - $(HostResolverPackageVersion) - - - $(SharedFxDebPkgName) - - - $(SharedFrameworkName) - - - $(RuntimePackageVersion) - - - $(SharedFrameworkBrandName) - - - $(RuntimeDependenciesDebPkgName) - - - $(RuntimeDepsDebPackageVersion) - - - $(RuntimePackageRelease) - - - - - - - - - - - - - - - - - - - - - - - $(RuntimeDependenciesDebPkgName) - $(RuntimeDepsDebPackageVersion) - $(DotnetRuntimeDependenciesPackageInstallerFile) - dotnet-runtime-deps-debian_config.json - $(debPackaginfConfigPath)$(ConfigJsonName) - $(PackagesIntermediateDir)$(DebPackageName)/$(DebPackageVersion) - - - - $(debIntermediatesDir)/debianLayoutDirectory/ - $(debLayoutDirectory)$ - $(debLayoutDirectory)package_root - $(debLayoutDirectory)samples - $(debLayoutDirectory)docs - - - - - - - - - - - - - - - - - - - - $(RuntimeDependenciesDebPkgName) - - - $(RuntimeDepsDebPackageVersion) - - - $(RuntimeDepsDebPackageRelease) - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/installer/pkg/packaging/installers.proj b/src/installer/pkg/packaging/installers.proj deleted file mode 100644 index a3494e48efaed..0000000000000 --- a/src/installer/pkg/packaging/installers.proj +++ /dev/null @@ -1,275 +0,0 @@ - - - - - true - - - - - - - GetInstallerLocations; - GenerateVersionBadge; - GenerateCompressedFiles; - GenerateInstallers; - GenerateProjectInstallers; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_InstallerProject Include="$(InstallerProjectRoot)pkg\projects\**\*.pkgproj" /> - <_InstallerProject Include="$(InstallerProjectRoot)pkg\projects\**\*.sfxproj" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_NetHostOutputDir>$(ArtifactsBinDir)$(InstallerSourceOSPlatformConfig)\corehost\ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(MSBuildThisFileDirectory)version_badge.svg - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - GeneratePkgs; - GenerateDebs; - GenerateRpms; - - - - - diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/cs.lproj/conclusion.html b/src/installer/pkg/packaging/osx/hostfxr/resources/cs.lproj/conclusion.html deleted file mode 100644 index a7031e4d8dcd7..0000000000000 --- a/src/installer/pkg/packaging/osx/hostfxr/resources/cs.lproj/conclusion.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - Congratulations! You've successfully installed .NET CLI! - - -
-

The installation was successful.

-

.NET CLI was successfully installed.

-

- Install dependencies -

-

- In order to be able to use .NET on OS X, you need to install OpenSSL version 1.0.1/1.0.2. - There are many ways to install/update your libssl. Using Homebrew is the easiest. - You can view the instructions here or if you're updating, on this page. -

-
- - diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/cs.lproj/welcome.html b/src/installer/pkg/packaging/osx/hostfxr/resources/cs.lproj/welcome.html deleted file mode 100644 index 94cadedb4fb96..0000000000000 --- a/src/installer/pkg/packaging/osx/hostfxr/resources/cs.lproj/welcome.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - - Welcome to the .NET CLI installer. - - - -

- Microsoft .NET CLI -

-

- .NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs. -

-

- This package contains all the tools you will need to start writing applications with .NET. It includes the several tools, including the C# compiler and the NuGet package manager, and a copy of .NET for both you and the tools to use. -

-
- - \ No newline at end of file diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/de.lproj/conclusion.html b/src/installer/pkg/packaging/osx/hostfxr/resources/de.lproj/conclusion.html deleted file mode 100644 index a7031e4d8dcd7..0000000000000 --- a/src/installer/pkg/packaging/osx/hostfxr/resources/de.lproj/conclusion.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - Congratulations! You've successfully installed .NET CLI! - - -
-

The installation was successful.

-

.NET CLI was successfully installed.

-

- Install dependencies -

-

- In order to be able to use .NET on OS X, you need to install OpenSSL version 1.0.1/1.0.2. - There are many ways to install/update your libssl. Using Homebrew is the easiest. - You can view the instructions here or if you're updating, on this page. -

-
- - diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/de.lproj/welcome.html b/src/installer/pkg/packaging/osx/hostfxr/resources/de.lproj/welcome.html deleted file mode 100644 index 94cadedb4fb96..0000000000000 --- a/src/installer/pkg/packaging/osx/hostfxr/resources/de.lproj/welcome.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - - Welcome to the .NET CLI installer. - - - -

- Microsoft .NET CLI -

-

- .NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs. -

-

- This package contains all the tools you will need to start writing applications with .NET. It includes the several tools, including the C# compiler and the NuGet package manager, and a copy of .NET for both you and the tools to use. -

-
- - \ No newline at end of file diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/en.lproj/conclusion.html b/src/installer/pkg/packaging/osx/hostfxr/resources/en.lproj/conclusion.html deleted file mode 100644 index a7031e4d8dcd7..0000000000000 --- a/src/installer/pkg/packaging/osx/hostfxr/resources/en.lproj/conclusion.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - Congratulations! You've successfully installed .NET CLI! - - -
-

The installation was successful.

-

.NET CLI was successfully installed.

-

- Install dependencies -

-

- In order to be able to use .NET on OS X, you need to install OpenSSL version 1.0.1/1.0.2. - There are many ways to install/update your libssl. Using Homebrew is the easiest. - You can view the instructions here or if you're updating, on this page. -

-
- - diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/en.lproj/welcome.html b/src/installer/pkg/packaging/osx/hostfxr/resources/en.lproj/welcome.html deleted file mode 100644 index 94cadedb4fb96..0000000000000 --- a/src/installer/pkg/packaging/osx/hostfxr/resources/en.lproj/welcome.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - - Welcome to the .NET CLI installer. - - - -

- Microsoft .NET CLI -

-

- .NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs. -

-

- This package contains all the tools you will need to start writing applications with .NET. It includes the several tools, including the C# compiler and the NuGet package manager, and a copy of .NET for both you and the tools to use. -

-
- - \ No newline at end of file diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/es.lproj/conclusion.html b/src/installer/pkg/packaging/osx/hostfxr/resources/es.lproj/conclusion.html deleted file mode 100644 index a7031e4d8dcd7..0000000000000 --- a/src/installer/pkg/packaging/osx/hostfxr/resources/es.lproj/conclusion.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - Congratulations! You've successfully installed .NET CLI! - - -
-

The installation was successful.

-

.NET CLI was successfully installed.

-

- Install dependencies -

-

- In order to be able to use .NET on OS X, you need to install OpenSSL version 1.0.1/1.0.2. - There are many ways to install/update your libssl. Using Homebrew is the easiest. - You can view the instructions here or if you're updating, on this page. -

-
- - diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/es.lproj/welcome.html b/src/installer/pkg/packaging/osx/hostfxr/resources/es.lproj/welcome.html deleted file mode 100644 index 94cadedb4fb96..0000000000000 --- a/src/installer/pkg/packaging/osx/hostfxr/resources/es.lproj/welcome.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - - Welcome to the .NET CLI installer. - - - -

- Microsoft .NET CLI -

-

- .NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs. -

-

- This package contains all the tools you will need to start writing applications with .NET. It includes the several tools, including the C# compiler and the NuGet package manager, and a copy of .NET for both you and the tools to use. -

-
- - \ No newline at end of file diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/fr.lproj/conclusion.html b/src/installer/pkg/packaging/osx/hostfxr/resources/fr.lproj/conclusion.html deleted file mode 100644 index a7031e4d8dcd7..0000000000000 --- a/src/installer/pkg/packaging/osx/hostfxr/resources/fr.lproj/conclusion.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - Congratulations! You've successfully installed .NET CLI! - - -
-

The installation was successful.

-

.NET CLI was successfully installed.

-

- Install dependencies -

-

- In order to be able to use .NET on OS X, you need to install OpenSSL version 1.0.1/1.0.2. - There are many ways to install/update your libssl. Using Homebrew is the easiest. - You can view the instructions here or if you're updating, on this page. -

-
- - diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/fr.lproj/welcome.html b/src/installer/pkg/packaging/osx/hostfxr/resources/fr.lproj/welcome.html deleted file mode 100644 index 94cadedb4fb96..0000000000000 --- a/src/installer/pkg/packaging/osx/hostfxr/resources/fr.lproj/welcome.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - - Welcome to the .NET CLI installer. - - - -

- Microsoft .NET CLI -

-

- .NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs. -

-

- This package contains all the tools you will need to start writing applications with .NET. It includes the several tools, including the C# compiler and the NuGet package manager, and a copy of .NET for both you and the tools to use. -

-
- - \ No newline at end of file diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/it.lproj/conclusion.html b/src/installer/pkg/packaging/osx/hostfxr/resources/it.lproj/conclusion.html deleted file mode 100644 index a7031e4d8dcd7..0000000000000 --- a/src/installer/pkg/packaging/osx/hostfxr/resources/it.lproj/conclusion.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - Congratulations! You've successfully installed .NET CLI! - - -
-

The installation was successful.

-

.NET CLI was successfully installed.

-

- Install dependencies -

-

- In order to be able to use .NET on OS X, you need to install OpenSSL version 1.0.1/1.0.2. - There are many ways to install/update your libssl. Using Homebrew is the easiest. - You can view the instructions here or if you're updating, on this page. -

-
- - diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/it.lproj/welcome.html b/src/installer/pkg/packaging/osx/hostfxr/resources/it.lproj/welcome.html deleted file mode 100644 index 94cadedb4fb96..0000000000000 --- a/src/installer/pkg/packaging/osx/hostfxr/resources/it.lproj/welcome.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - - Welcome to the .NET CLI installer. - - - -

- Microsoft .NET CLI -

-

- .NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs. -

-

- This package contains all the tools you will need to start writing applications with .NET. It includes the several tools, including the C# compiler and the NuGet package manager, and a copy of .NET for both you and the tools to use. -

-
- - \ No newline at end of file diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/ja.lproj/conclusion.html b/src/installer/pkg/packaging/osx/hostfxr/resources/ja.lproj/conclusion.html deleted file mode 100644 index a7031e4d8dcd7..0000000000000 --- a/src/installer/pkg/packaging/osx/hostfxr/resources/ja.lproj/conclusion.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - Congratulations! You've successfully installed .NET CLI! - - -
-

The installation was successful.

-

.NET CLI was successfully installed.

-

- Install dependencies -

-

- In order to be able to use .NET on OS X, you need to install OpenSSL version 1.0.1/1.0.2. - There are many ways to install/update your libssl. Using Homebrew is the easiest. - You can view the instructions here or if you're updating, on this page. -

-
- - diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/ja.lproj/welcome.html b/src/installer/pkg/packaging/osx/hostfxr/resources/ja.lproj/welcome.html deleted file mode 100644 index 94cadedb4fb96..0000000000000 --- a/src/installer/pkg/packaging/osx/hostfxr/resources/ja.lproj/welcome.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - - Welcome to the .NET CLI installer. - - - -

- Microsoft .NET CLI -

-

- .NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs. -

-

- This package contains all the tools you will need to start writing applications with .NET. It includes the several tools, including the C# compiler and the NuGet package manager, and a copy of .NET for both you and the tools to use. -

-
- - \ No newline at end of file diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/ko.lproj/conclusion.html b/src/installer/pkg/packaging/osx/hostfxr/resources/ko.lproj/conclusion.html deleted file mode 100644 index a7031e4d8dcd7..0000000000000 --- a/src/installer/pkg/packaging/osx/hostfxr/resources/ko.lproj/conclusion.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - Congratulations! You've successfully installed .NET CLI! - - -
-

The installation was successful.

-

.NET CLI was successfully installed.

-

- Install dependencies -

-

- In order to be able to use .NET on OS X, you need to install OpenSSL version 1.0.1/1.0.2. - There are many ways to install/update your libssl. Using Homebrew is the easiest. - You can view the instructions here or if you're updating, on this page. -

-
- - diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/ko.lproj/welcome.html b/src/installer/pkg/packaging/osx/hostfxr/resources/ko.lproj/welcome.html deleted file mode 100644 index 94cadedb4fb96..0000000000000 --- a/src/installer/pkg/packaging/osx/hostfxr/resources/ko.lproj/welcome.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - - Welcome to the .NET CLI installer. - - - -

- Microsoft .NET CLI -

-

- .NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs. -

-

- This package contains all the tools you will need to start writing applications with .NET. It includes the several tools, including the C# compiler and the NuGet package manager, and a copy of .NET for both you and the tools to use. -

-
- - \ No newline at end of file diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/pl.lproj/conclusion.html b/src/installer/pkg/packaging/osx/hostfxr/resources/pl.lproj/conclusion.html deleted file mode 100644 index a7031e4d8dcd7..0000000000000 --- a/src/installer/pkg/packaging/osx/hostfxr/resources/pl.lproj/conclusion.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - Congratulations! You've successfully installed .NET CLI! - - -
-

The installation was successful.

-

.NET CLI was successfully installed.

-

- Install dependencies -

-

- In order to be able to use .NET on OS X, you need to install OpenSSL version 1.0.1/1.0.2. - There are many ways to install/update your libssl. Using Homebrew is the easiest. - You can view the instructions here or if you're updating, on this page. -

-
- - diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/pl.lproj/welcome.html b/src/installer/pkg/packaging/osx/hostfxr/resources/pl.lproj/welcome.html deleted file mode 100644 index 94cadedb4fb96..0000000000000 --- a/src/installer/pkg/packaging/osx/hostfxr/resources/pl.lproj/welcome.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - - Welcome to the .NET CLI installer. - - - -

- Microsoft .NET CLI -

-

- .NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs. -

-

- This package contains all the tools you will need to start writing applications with .NET. It includes the several tools, including the C# compiler and the NuGet package manager, and a copy of .NET for both you and the tools to use. -

-
- - \ No newline at end of file diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/pt-br.lproj/conclusion.html b/src/installer/pkg/packaging/osx/hostfxr/resources/pt-br.lproj/conclusion.html deleted file mode 100644 index a7031e4d8dcd7..0000000000000 --- a/src/installer/pkg/packaging/osx/hostfxr/resources/pt-br.lproj/conclusion.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - Congratulations! You've successfully installed .NET CLI! - - -
-

The installation was successful.

-

.NET CLI was successfully installed.

-

- Install dependencies -

-

- In order to be able to use .NET on OS X, you need to install OpenSSL version 1.0.1/1.0.2. - There are many ways to install/update your libssl. Using Homebrew is the easiest. - You can view the instructions here or if you're updating, on this page. -

-
- - diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/pt-br.lproj/welcome.html b/src/installer/pkg/packaging/osx/hostfxr/resources/pt-br.lproj/welcome.html deleted file mode 100644 index 94cadedb4fb96..0000000000000 --- a/src/installer/pkg/packaging/osx/hostfxr/resources/pt-br.lproj/welcome.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - - Welcome to the .NET CLI installer. - - - -

- Microsoft .NET CLI -

-

- .NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs. -

-

- This package contains all the tools you will need to start writing applications with .NET. It includes the several tools, including the C# compiler and the NuGet package manager, and a copy of .NET for both you and the tools to use. -

-
- - \ No newline at end of file diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/ru.lproj/conclusion.html b/src/installer/pkg/packaging/osx/hostfxr/resources/ru.lproj/conclusion.html deleted file mode 100644 index a7031e4d8dcd7..0000000000000 --- a/src/installer/pkg/packaging/osx/hostfxr/resources/ru.lproj/conclusion.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - Congratulations! You've successfully installed .NET CLI! - - -
-

The installation was successful.

-

.NET CLI was successfully installed.

-

- Install dependencies -

-

- In order to be able to use .NET on OS X, you need to install OpenSSL version 1.0.1/1.0.2. - There are many ways to install/update your libssl. Using Homebrew is the easiest. - You can view the instructions here or if you're updating, on this page. -

-
- - diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/ru.lproj/welcome.html b/src/installer/pkg/packaging/osx/hostfxr/resources/ru.lproj/welcome.html deleted file mode 100644 index 94cadedb4fb96..0000000000000 --- a/src/installer/pkg/packaging/osx/hostfxr/resources/ru.lproj/welcome.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - - Welcome to the .NET CLI installer. - - - -

- Microsoft .NET CLI -

-

- .NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs. -

-

- This package contains all the tools you will need to start writing applications with .NET. It includes the several tools, including the C# compiler and the NuGet package manager, and a copy of .NET for both you and the tools to use. -

-
- - \ No newline at end of file diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/tr.lproj/conclusion.html b/src/installer/pkg/packaging/osx/hostfxr/resources/tr.lproj/conclusion.html deleted file mode 100644 index a7031e4d8dcd7..0000000000000 --- a/src/installer/pkg/packaging/osx/hostfxr/resources/tr.lproj/conclusion.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - Congratulations! You've successfully installed .NET CLI! - - -
-

The installation was successful.

-

.NET CLI was successfully installed.

-

- Install dependencies -

-

- In order to be able to use .NET on OS X, you need to install OpenSSL version 1.0.1/1.0.2. - There are many ways to install/update your libssl. Using Homebrew is the easiest. - You can view the instructions here or if you're updating, on this page. -

-
- - diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/tr.lproj/welcome.html b/src/installer/pkg/packaging/osx/hostfxr/resources/tr.lproj/welcome.html deleted file mode 100644 index 94cadedb4fb96..0000000000000 --- a/src/installer/pkg/packaging/osx/hostfxr/resources/tr.lproj/welcome.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - - Welcome to the .NET CLI installer. - - - -

- Microsoft .NET CLI -

-

- .NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs. -

-

- This package contains all the tools you will need to start writing applications with .NET. It includes the several tools, including the C# compiler and the NuGet package manager, and a copy of .NET for both you and the tools to use. -

-
- - \ No newline at end of file diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/zh-hans.lproj/conclusion.html b/src/installer/pkg/packaging/osx/hostfxr/resources/zh-hans.lproj/conclusion.html deleted file mode 100644 index a7031e4d8dcd7..0000000000000 --- a/src/installer/pkg/packaging/osx/hostfxr/resources/zh-hans.lproj/conclusion.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - Congratulations! You've successfully installed .NET CLI! - - -
-

The installation was successful.

-

.NET CLI was successfully installed.

-

- Install dependencies -

-

- In order to be able to use .NET on OS X, you need to install OpenSSL version 1.0.1/1.0.2. - There are many ways to install/update your libssl. Using Homebrew is the easiest. - You can view the instructions here or if you're updating, on this page. -

-
- - diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/zh-hans.lproj/welcome.html b/src/installer/pkg/packaging/osx/hostfxr/resources/zh-hans.lproj/welcome.html deleted file mode 100644 index 94cadedb4fb96..0000000000000 --- a/src/installer/pkg/packaging/osx/hostfxr/resources/zh-hans.lproj/welcome.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - - Welcome to the .NET CLI installer. - - - -

- Microsoft .NET CLI -

-

- .NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs. -

-

- This package contains all the tools you will need to start writing applications with .NET. It includes the several tools, including the C# compiler and the NuGet package manager, and a copy of .NET for both you and the tools to use. -

-
- - \ No newline at end of file diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/zh-hant.lproj/conclusion.html b/src/installer/pkg/packaging/osx/hostfxr/resources/zh-hant.lproj/conclusion.html deleted file mode 100644 index a7031e4d8dcd7..0000000000000 --- a/src/installer/pkg/packaging/osx/hostfxr/resources/zh-hant.lproj/conclusion.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - Congratulations! You've successfully installed .NET CLI! - - -
-

The installation was successful.

-

.NET CLI was successfully installed.

-

- Install dependencies -

-

- In order to be able to use .NET on OS X, you need to install OpenSSL version 1.0.1/1.0.2. - There are many ways to install/update your libssl. Using Homebrew is the easiest. - You can view the instructions here or if you're updating, on this page. -

-
- - diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/zh-hant.lproj/welcome.html b/src/installer/pkg/packaging/osx/hostfxr/resources/zh-hant.lproj/welcome.html deleted file mode 100644 index 94cadedb4fb96..0000000000000 --- a/src/installer/pkg/packaging/osx/hostfxr/resources/zh-hant.lproj/welcome.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - - Welcome to the .NET CLI installer. - - - -

- Microsoft .NET CLI -

-

- .NET is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs. -

-

- This package contains all the tools you will need to start writing applications with .NET. It includes the several tools, including the C# compiler and the NuGet package manager, and a copy of .NET for both you and the tools to use. -

-
- - \ No newline at end of file diff --git a/src/installer/pkg/packaging/osx/package.props b/src/installer/pkg/packaging/osx/package.props deleted file mode 100644 index 447ffe38c7efb..0000000000000 --- a/src/installer/pkg/packaging/osx/package.props +++ /dev/null @@ -1,6 +0,0 @@ - - - - $(PackagingRoot)osx/ - - \ No newline at end of file diff --git a/src/installer/pkg/packaging/osx/package.targets b/src/installer/pkg/packaging/osx/package.targets deleted file mode 100644 index 722676fffc197..0000000000000 --- a/src/installer/pkg/packaging/osx/package.targets +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - $(SharedFxComponentId) - $(SharedFrameworkPublishRoot) - - $(PackagesIntermediateDir)$(SharedFxComponentId).pkg - $(SharedFrameworkInstallerFile) - - - $(SharedHostComponentId) - $(SharedHostPublishRoot) - - $(PackagesIntermediateDir)$(SharedHostComponentId).pkg - $(SharedHostInstallerFile) - - - $(HostFxrComponentId) - $(HostFxrPublishRoot) - - $(PackagesIntermediateDir)$(HostFxrComponentId).pkg - $(HostFxrInstallerFile) - - - - - /usr/local/share/dotnet - --version $(SharedFrameworkNugetVersion) --install-location $(InstallLocation) - - - - - - - - - $(OSXScriptRoot)sharedframework/ - $(PackagesIntermediateDir)resources - $(CombinedInstallerFile) - shared-framework-distribution-template.xml - $(PackagesIntermediateDir)$(TemplateFile) - - - - - - - - - - - - - - conclusion.html - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/dotnetbackground.png b/src/installer/pkg/packaging/osx/sharedframework/resources/dotnetbackground.png deleted file mode 100644 index 16a6bf22ba789..0000000000000 Binary files a/src/installer/pkg/packaging/osx/sharedframework/resources/dotnetbackground.png and /dev/null differ diff --git a/src/installer/pkg/packaging/osx/sharedframework/scripts/postinstall b/src/installer/pkg/packaging/osx/sharedframework/scripts/postinstall deleted file mode 100755 index 734abc33de6ec..0000000000000 --- a/src/installer/pkg/packaging/osx/sharedframework/scripts/postinstall +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. -# - -PACKAGE=$1 -INSTALL_DESTINATION=$2 - -# A temporary fix for the permissions issue(s) -chmod -R 755 $INSTALL_DESTINATION/shared - -exit 0 diff --git a/src/installer/pkg/packaging/osx/sharedframework/shared-framework-distribution-template.xml b/src/installer/pkg/packaging/osx/sharedframework/shared-framework-distribution-template.xml deleted file mode 100644 index b910e9f83de2b..0000000000000 --- a/src/installer/pkg/packaging/osx/sharedframework/shared-framework-distribution-template.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - {SharedFxBrandName} (x64) - - - - - - - - - - - - - - - - - - - - - - - - {SharedFxComponentId}.pkg - {HostFxrComponentId}.pkg - {SharedHostComponentId}.pkg - diff --git a/src/installer/pkg/packaging/pack-managed.proj b/src/installer/pkg/packaging/pack-managed.proj deleted file mode 100644 index acefdfff86d10..0000000000000 --- a/src/installer/pkg/packaging/pack-managed.proj +++ /dev/null @@ -1,24 +0,0 @@ - - - - - $(NetCoreAppCurrent) - - - - - - - - - - - - - - - - diff --git a/src/installer/pkg/packaging/rpm/dotnet-hostfxr-rpm_config.json b/src/installer/pkg/packaging/rpm/dotnet-hostfxr-rpm_config.json deleted file mode 100644 index 2b2d08b4f29e7..0000000000000 --- a/src/installer/pkg/packaging/rpm/dotnet-hostfxr-rpm_config.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "maintainer_name": ".NET Team", - "maintainer_email": "dotnetpackages@dotnetfoundation.org", - "vendor": ".NET Foundation", - - "package_name": "%HOSTFXR_RPM_PACKAGE_NAME%", - "install_root": "/usr/share/dotnet", - "install_doc": "/usr/share/doc/%HOSTFXR_RPM_PACKAGE_NAME%/", - - "short_description": "%HOSTFXR_BRAND_NAME% %HOSTFXR_NUGET_VERSION%", - "long_description": ".NET is a development platform that you can use to build command-line\napplications, microservices and modern websites. It is open source,\ncross-platform and is supported by Microsoft. We hope you enjoy using it!\nIf you do, please consider joining the active community of developers that are\ncontributing to the project on GitHub (https://github.com/dotnet/core).\nWe happily accept issues and PRs.", - "homepage": "https://github.com/dotnet/core", - - "release":{ - "package_version":"1.0.0.0", - "package_revision":"%HOSTFXR_REVISION%", - "urgency" : "low", - "changelog_message" : "https://github.com/dotnet/core/tree/master/release-notes" - }, - - "control": { - "priority":"standard", - "section":"libs", - "architecture":"amd64" - }, - - "copyright": "2017 Microsoft", - - "license": { - "type": "MIT and ASL 2.0 and BSD", - "full_text": "Copyright (c) 2017 Microsoft\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE." - }, - - "rpm_dependencies": [{ - "package_name": "dotnet-host", - "package_version": "%SHARED_HOST_RPM_VERSION%" - }], - - "directories" : [ - "/usr/share/dotnet/host", - "/usr/share/doc/%HOSTFXR_RPM_PACKAGE_NAME%" - ] -} \ No newline at end of file diff --git a/src/installer/pkg/packaging/rpm/dotnet-runtime-deps-rpm_config_centos.7-x64.json b/src/installer/pkg/packaging/rpm/dotnet-runtime-deps-rpm_config_centos.7-x64.json deleted file mode 100644 index 2ab384b5923d7..0000000000000 --- a/src/installer/pkg/packaging/rpm/dotnet-runtime-deps-rpm_config_centos.7-x64.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "maintainer_name": ".NET Team", - "maintainer_email": "dotnetpackages@dotnetfoundation.org", - "vendor": ".NET Foundation", - - "package_name": "%RUNTIME_DEPS_RPM_PACKAGE_NAME%", - "install_root": "/usr/share/dotnet", - - "short_description": "%RUNTIME_DEPS_RPM_PACKAGE_NAME% %RUNTIME_DEPS_VERSION%", - "long_description": ".NET is a development platform that you can use to build command-line applications, microservices and modern websites. This package installs all the system dependencies for .NET Runtime.", - "homepage": "https://dot.net/core", - - "release":{ - "package_version":"1.0.0.0", - "package_revision":"%RUNTIME_DEPS_REVISION%", - "urgency" : "low", - "changelog_message" : "https://github.com/dotnet/core/tree/master/release-notes" - }, - - "control": { - "priority":"standard", - "section":"libs", - "architecture":"amd64" - }, - - "copyright": "2018 Microsoft", - "license": { - "type": "MIT", - "full_text": "Copyright (c) 2018 Microsoft\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE." - }, - - "rpm_dependencies":[{ - "package_name": "openssl-libs", - "package_version": "" - }, - { - "package_name": "libicu", - "package_version": "" - }, - { - "package_name": "krb5-libs", - "package_version": "" - }] -} diff --git a/src/installer/pkg/packaging/rpm/dotnet-runtime-deps-rpm_config_fedora.27-x64.json b/src/installer/pkg/packaging/rpm/dotnet-runtime-deps-rpm_config_fedora.27-x64.json deleted file mode 100644 index fb1c925c70648..0000000000000 --- a/src/installer/pkg/packaging/rpm/dotnet-runtime-deps-rpm_config_fedora.27-x64.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "maintainer_name": ".NET Team", - "maintainer_email": "dotnetpackages@dotnetfoundation.org", - "vendor": ".NET Foundation", - - "package_name": "%RUNTIME_DEPS_RPM_PACKAGE_NAME%", - "install_root": "/usr/share/dotnet", - - "short_description": "%RUNTIME_DEPS_RPM_PACKAGE_NAME% %RUNTIME_DEPS_VERSION%", - "long_description": ".NET is a development platform that you can use to build command-line applications, microservices and modern websites. This package installs all the system dependencies for .NET Runtime.", - "homepage": "https://dot.net/core", - - "release":{ - "package_version":"1.0.0.0", - "package_revision":"%RUNTIME_DEPS_REVISION%", - "urgency" : "low", - "changelog_message" : "https://github.com/dotnet/core/tree/master/release-notes" - }, - - "control": { - "priority":"standard", - "section":"libs", - "architecture":"amd64" - }, - - "copyright": "2018 Microsoft", - "license": { - "type": "MIT", - "full_text": "Copyright (c) 2018 Microsoft\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE." - }, - - "rpm_dependencies":[{ - "package_name": "compat-openssl10", - "package_version": "" - }, - { - "package_name": "libicu", - "package_version": "" - }, - { - "package_name": "krb5-libs", - "package_version": "" - }] -} diff --git a/src/installer/pkg/packaging/rpm/dotnet-runtime-deps-rpm_config_opensuse.42-x64.json b/src/installer/pkg/packaging/rpm/dotnet-runtime-deps-rpm_config_opensuse.42-x64.json deleted file mode 100644 index 1c208459b79dd..0000000000000 --- a/src/installer/pkg/packaging/rpm/dotnet-runtime-deps-rpm_config_opensuse.42-x64.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "maintainer_name": ".NET Team", - "maintainer_email": "dotnetpackages@dotnetfoundation.org", - "vendor": ".NET Foundation", - - "package_name": "%RUNTIME_DEPS_RPM_PACKAGE_NAME%", - "install_root": "/usr/share/dotnet", - - "short_description": "%RUNTIME_DEPS_RPM_PACKAGE_NAME% %RUNTIME_DEPS_VERSION%", - "long_description": ".NET is a development platform that you can use to build command-line applications, microservices and modern websites. This package installs all the system dependencies for .NET Runtime.", - "homepage": "https://dot.net/core", - - "release":{ - "package_version":"1.0.0.0", - "package_revision":"%RUNTIME_DEPS_REVISION%", - "urgency" : "low", - "changelog_message" : "https://github.com/dotnet/core/tree/master/release-notes" - }, - - "control": { - "priority":"standard", - "section":"libs", - "architecture":"amd64" - }, - - "copyright": "2018 Microsoft", - "license": { - "type": "MIT", - "full_text": "Copyright (c) 2018 Microsoft\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE." - }, - - "rpm_dependencies":[{ - "package_name": "libopenssl1_0_0", - "package_version": "" - }, - { - "package_name": "libicu", - "package_version": "" - }, - { - "package_name": "krb5", - "package_version": "" - }] -} diff --git a/src/installer/pkg/packaging/rpm/dotnet-runtime-deps-rpm_config_oraclelinux.7-x64.json b/src/installer/pkg/packaging/rpm/dotnet-runtime-deps-rpm_config_oraclelinux.7-x64.json deleted file mode 100644 index 2ab384b5923d7..0000000000000 --- a/src/installer/pkg/packaging/rpm/dotnet-runtime-deps-rpm_config_oraclelinux.7-x64.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "maintainer_name": ".NET Team", - "maintainer_email": "dotnetpackages@dotnetfoundation.org", - "vendor": ".NET Foundation", - - "package_name": "%RUNTIME_DEPS_RPM_PACKAGE_NAME%", - "install_root": "/usr/share/dotnet", - - "short_description": "%RUNTIME_DEPS_RPM_PACKAGE_NAME% %RUNTIME_DEPS_VERSION%", - "long_description": ".NET is a development platform that you can use to build command-line applications, microservices and modern websites. This package installs all the system dependencies for .NET Runtime.", - "homepage": "https://dot.net/core", - - "release":{ - "package_version":"1.0.0.0", - "package_revision":"%RUNTIME_DEPS_REVISION%", - "urgency" : "low", - "changelog_message" : "https://github.com/dotnet/core/tree/master/release-notes" - }, - - "control": { - "priority":"standard", - "section":"libs", - "architecture":"amd64" - }, - - "copyright": "2018 Microsoft", - "license": { - "type": "MIT", - "full_text": "Copyright (c) 2018 Microsoft\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE." - }, - - "rpm_dependencies":[{ - "package_name": "openssl-libs", - "package_version": "" - }, - { - "package_name": "libicu", - "package_version": "" - }, - { - "package_name": "krb5-libs", - "package_version": "" - }] -} diff --git a/src/installer/pkg/packaging/rpm/dotnet-runtime-deps-rpm_config_rhel.7-x64.json b/src/installer/pkg/packaging/rpm/dotnet-runtime-deps-rpm_config_rhel.7-x64.json deleted file mode 100644 index 2ab384b5923d7..0000000000000 --- a/src/installer/pkg/packaging/rpm/dotnet-runtime-deps-rpm_config_rhel.7-x64.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "maintainer_name": ".NET Team", - "maintainer_email": "dotnetpackages@dotnetfoundation.org", - "vendor": ".NET Foundation", - - "package_name": "%RUNTIME_DEPS_RPM_PACKAGE_NAME%", - "install_root": "/usr/share/dotnet", - - "short_description": "%RUNTIME_DEPS_RPM_PACKAGE_NAME% %RUNTIME_DEPS_VERSION%", - "long_description": ".NET is a development platform that you can use to build command-line applications, microservices and modern websites. This package installs all the system dependencies for .NET Runtime.", - "homepage": "https://dot.net/core", - - "release":{ - "package_version":"1.0.0.0", - "package_revision":"%RUNTIME_DEPS_REVISION%", - "urgency" : "low", - "changelog_message" : "https://github.com/dotnet/core/tree/master/release-notes" - }, - - "control": { - "priority":"standard", - "section":"libs", - "architecture":"amd64" - }, - - "copyright": "2018 Microsoft", - "license": { - "type": "MIT", - "full_text": "Copyright (c) 2018 Microsoft\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE." - }, - - "rpm_dependencies":[{ - "package_name": "openssl-libs", - "package_version": "" - }, - { - "package_name": "libicu", - "package_version": "" - }, - { - "package_name": "krb5-libs", - "package_version": "" - }] -} diff --git a/src/installer/pkg/packaging/rpm/dotnet-runtime-deps-rpm_config_sles.12-x64.json b/src/installer/pkg/packaging/rpm/dotnet-runtime-deps-rpm_config_sles.12-x64.json deleted file mode 100644 index fc854bb6c957d..0000000000000 --- a/src/installer/pkg/packaging/rpm/dotnet-runtime-deps-rpm_config_sles.12-x64.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "maintainer_name": ".NET Team", - "maintainer_email": "dotnetpackages@dotnetfoundation.org", - "vendor": ".NET Foundation", - - "package_name": "%RUNTIME_DEPS_RPM_PACKAGE_NAME%", - "install_root": "/usr/share/dotnet", - - "short_description": "%RUNTIME_DEPS_RPM_PACKAGE_NAME% %RUNTIME_DEPS_VERSION%", - "long_description": ".NET is a development platform that you can use to build command-line applications, microservices and modern websites. This package installs all the system dependencies for .NET Runtime.", - "homepage": "https://dot.net/core", - - "release":{ - "package_version":"1.0.0.0", - "package_revision":"%RUNTIME_DEPS_REVISION%", - "urgency" : "low", - "changelog_message" : "https://github.com/dotnet/core/tree/master/release-notes" - }, - - "control": { - "priority":"standard", - "section":"libs", - "architecture":"amd64" - }, - - "copyright": "2018 Microsoft", - "license": { - "type": "MIT", - "full_text": "Copyright (c) 2018 Microsoft\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE." - }, - - "rpm_dependencies":[{ - "package_name": "libopenssl1_1", - "package_version": "" - }, - { - "package_name": "libicu", - "package_version": "" - }, - { - "package_name": "krb5", - "package_version": "" - }] -} diff --git a/src/installer/pkg/packaging/rpm/dotnet-sharedframework-rpm_config.json b/src/installer/pkg/packaging/rpm/dotnet-sharedframework-rpm_config.json deleted file mode 100644 index e41d25617c87f..0000000000000 --- a/src/installer/pkg/packaging/rpm/dotnet-sharedframework-rpm_config.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "maintainer_name": ".NET Team", - "maintainer_email": "dotnetpackages@dotnetfoundation.org", - "vendor": ".NET Foundation", - - "package_name": "%SHARED_FRAMEWORK_RPM_PACKAGE_NAME%", - "install_root": "/usr/share/dotnet", - "install_doc": "/usr/share/doc/%SHARED_FRAMEWORK_RPM_PACKAGE_NAME%/", - - "short_description": "%SHARED_FRAMEWORK_BRAND_NAME% %SHARED_FRAMEWORK_NUGET_NAME%", - "long_description": ".NET is a development platform that you can use to build command-line\napplications, microservices and modern websites. It is open source,\ncross-platform and is supported by Microsoft. We hope you enjoy using it!\nIf you do, please consider joining the active community of developers that are\ncontributing to the project on GitHub (https://github.com/dotnet/core).\nWe happily accept issues and PRs.", - "homepage": "https://github.com/dotnet/core", - - "release":{ - "package_version":"1.0.0.0", - "package_revision":"%SHARED_FRAMEWORK_REVISION%", - "urgency" : "low", - "changelog_message" : "https://github.com/dotnet/core/tree/master/release-notes" - }, - - "control": { - "priority":"standard", - "section":"libs", - "architecture":"amd64" - }, - - "copyright": "2017 Microsoft", - "license": { - "type": "MIT and ASL 2.0 and BSD", - "full_text": "Copyright (c) 2017 Microsoft\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE." - }, - - "rpm_dependencies": [{ - "package_name": "%HOSTFXR_RPM_PACKAGE_NAME%", - "package_version": "%HOSTFXR_NUGET_VERSION%" - }, - { - "package_name": "%RUNTIME_DEPS_RPM_PACKAGE_NAME%", - "package_version": "%RUNTIME_DEPS_VERSION%" - }], - - "directories" : [ - "/usr/share/dotnet/shared", - "/usr/share/doc/%SHARED_FRAMEWORK_RPM_PACKAGE_NAME%" - ] -} diff --git a/src/installer/pkg/packaging/rpm/dotnet-sharedhost-rpm_config.json b/src/installer/pkg/packaging/rpm/dotnet-sharedhost-rpm_config.json deleted file mode 100644 index e443287e6594f..0000000000000 --- a/src/installer/pkg/packaging/rpm/dotnet-sharedhost-rpm_config.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "maintainer_name": ".NET Team", - "maintainer_email": "dotnetpackages@dotnetfoundation.org", - "vendor": ".NET Foundation", - - "package_name": "dotnet-host", - "install_root": "/", - "install_doc": "/usr/share/doc/dotnet-host/", - "install_man": "/usr/share/man/man1", - - "short_description": "%SHARED_HOST_BRAND_NAME%", - "long_description": ".NET is a development platform that you can use to build command-line\napplications, microservices and modern websites. It is open source,\ncross-platform and is supported by Microsoft. We hope you enjoy using it!\nIf you do, please consider joining the active community of developers that are\ncontributing to the project on GitHub (https://github.com/dotnet/core).\nWe happily accept issues and PRs.", - "homepage": "https://github.com/dotnet/core", - - "release":{ - "package_version":"1.0.0.0", - "package_revision":"%SHARED_HOST_REVISION%", - "urgency" : "low", - "changelog_message" : "https://github.com/dotnet/core/tree/master/release-notes" - }, - - "control": { - "priority":"standard", - "section":"libs", - "architecture":"amd64" - }, - - "copyright": "2017 Microsoft", - "license": { - "type": "MIT and ASL 2.0 and BSD", - "full_text": "Copyright (c) 2017 Microsoft\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE." - }, - - "package_conflicts" : [ - "dotnet", - "dotnet-nightly" - ], - - "directories" : [ - "/usr/share/dotnet", - "/usr/share/doc/dotnet-host" - ] -} diff --git a/src/installer/pkg/packaging/rpm/package.props b/src/installer/pkg/packaging/rpm/package.props deleted file mode 100644 index 90ab81b71917a..0000000000000 --- a/src/installer/pkg/packaging/rpm/package.props +++ /dev/null @@ -1,12 +0,0 @@ - - - - rpm_config.json - $(PackagingRoot)rpm/ - dotnet-host - $(SharedHostRpmPkgName.ToLower()) - - $(RpmTemplatesDir) - $(MSBuildThisFileDirectory)/scripts - - diff --git a/src/installer/pkg/packaging/rpm/package.targets b/src/installer/pkg/packaging/rpm/package.targets deleted file mode 100644 index 85cbbb5795fa6..0000000000000 --- a/src/installer/pkg/packaging/rpm/package.targets +++ /dev/null @@ -1,434 +0,0 @@ - - - - - - - - - - - - - - - - $(SharedHostRpmPkgName) - $(HostPackageVersion) - $(SharedHostPublishRoot) - $(SharedHostInstallerFile) - dotnet-sharedhost-rpm_config.json - $(rpmPackagingConfigPath)$(ConfigJsonName) - $(PackagesIntermediateDir)$(RpmPackageName)/$(RpmPackageVersion) - usr/share/dotnet/ - - - - $(RpmIntermediatesDir)/rpmLayoutDirectory/ - $(rpmLayoutDirectory)package_root/ - $(rpmLayoutPackageRoot)$(UsrShareDotnetPath) - $(rpmLayoutPackageRoot)usr/bin/ - $(rpmLayoutDirectory)docs - $(rpmLayoutDirectory)templates - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(SharedHostBrandName) - - - $(HostPackageRelease) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(HostFxrRpmPkgName) - $(HostResolverPackageVersion) - $(HostFxrPublishRoot) - $(HostFxrInstallerFile) - dotnet-hostfxr-rpm_config.json - $(rpmPackagingConfigPath)$(ConfigJsonName) - $(PackagesIntermediateDir)$(RpmPackageName)/$(RpmPackageVersion) - - - - $(RpmIntermediatesDir)/rpmLayoutDirectory/ - $(rpmLayoutDirectory)package_root - $(rpmLayoutDirectory)docs - $(rpmLayoutDirectory)templates - - - - - - - - - - - - - - - - - - - - - - - - - $(HostFxrBrandName) - - - $(HostPackageVersion) - - - $(HostResolverPackageVersion) - - - $(RpmPackageName) - - - $(HostResolverPackageRelease) - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(SharedFxRpmPkgName) - $(RuntimePackageVersion) - $(SharedFrameworkPublishRoot) - $(SharedFrameworkInstallerFile) - dotnet-sharedframework-rpm_config.json - $(rpmPackagingConfigPath)$(ConfigJsonName) - $(PackagesIntermediateDir)$(RpmPackageName)/$(RpmPackageVersion) - - - - $(RpmIntermediatesDir)/rpmLayoutDirectory/ - $(rpmLayoutDirectory)package_root - $(rpmLayoutDirectory)docs - $(rpmLayoutDirectory)templates - - - - - - - - - - - - - - - - - - - - - - - - - $(HostFxrRpmPkgName) - - - $(HostResolverPackageVersion) - - - $(RuntimeDependenciesRpmPkgName) - - - $(RuntimeDepsRpmPackageVersion) - - - $(SharedFxRpmPkgName) - - - $(SharedFrameworkName) - - - $(RuntimePackageVersion) - - - $(SharedFrameworkBrandName) - - - $(RuntimePackageRelease) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - rpmPackagingConfigPath=$(rpmPackagingConfigPath); - DotnetRuntimeDependenciesPackageInstallerFile=$(DotnetRuntimeDependenciesPackageInstallerFile); - OutputRid=$(OutputRid); - RuntimeDependenciesRpmPkgName=$(RuntimeDependenciesRpmPkgName); - RuntimeDepsRpmPackageVersion=$(RuntimeDepsRpmPackageVersion); - RuntimeDepsRpmPackageRelease=$(RuntimeDepsRpmPackageRelease); - TemplatesDir=$(TemplatesDir) - - dotnet-runtime-deps-rpm_config_ - - - - - - DepsRid=$(OutputRid);$(SharedProperties) - - - - - - - - - DepsRid=%(Rids.Identity);$(SharedProperties) - - - - - - - - - - $([System.String]::Copy('$(DotnetRuntimeDependenciesPackageInstallerFile)').Replace('$(OutputRid)', '$(DepsRid)')) - $(RuntimeDependenciesRpmPkgName) - $(RuntimeDepsRpmPackageVersion) - dotnet-runtime-deps-rpm_config_$(DepsRid).json - $(rpmPackagingConfigPath)$(ConfigJsonName) - $(PackagesIntermediateDir)$(RpmPackageName)/$(RpmPackageVersion) - - - - $(RpmIntermediatesDir)/rpmLayoutDirectory/ - $(RpmLayoutDirectory)package_root - $(RpmLayoutDirectory)docs - $(RpmLayoutDirectory)templates - - - - - - - - - - - - - - - - - - - - - - - - - - $(RpmPackageName) - - - $(RuntimeDepsRpmPackageVersion) - - - $(RuntimeDepsRpmPackageRelease) - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/installer/pkg/packaging/rpm/templates/changelog b/src/installer/pkg/packaging/rpm/templates/changelog deleted file mode 100644 index e61dbc607cb80..0000000000000 --- a/src/installer/pkg/packaging/rpm/templates/changelog +++ /dev/null @@ -1,2 +0,0 @@ -* {DATE} {MAINTAINER_NAME} <{MAINTAINER_EMAIL}> - {PACKAGE_VERSION}-{PACKAGE_REVISION} -- {CHANGELOG_MESSAGE} diff --git a/src/installer/pkg/packaging/rpm/templates/copyright b/src/installer/pkg/packaging/rpm/templates/copyright deleted file mode 100644 index a44f2cbd65168..0000000000000 --- a/src/installer/pkg/packaging/rpm/templates/copyright +++ /dev/null @@ -1,8 +0,0 @@ -Comment: Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. - -Files: * -Copyright: {COPYRIGHT_TEXT} -License: {LICENSE_NAME} - -License: {LICENSE_NAME} - {LICENSE_TEXT} diff --git a/src/installer/pkg/packaging/snaps/arm/dotnet-sdk-3.1/snap/snapcraft.yaml b/src/installer/pkg/packaging/snaps/arm/dotnet-sdk-3.1/snap/snapcraft.yaml deleted file mode 100644 index b9d9593496a84..0000000000000 --- a/src/installer/pkg/packaging/snaps/arm/dotnet-sdk-3.1/snap/snapcraft.yaml +++ /dev/null @@ -1,40 +0,0 @@ -name: dotnet-sdk -version: 3.1.201 -summary: Cross-Platform .NET Core SDK -description: | - .NET Core SDK. https://dot.net/core. - -grade: stable -confinement: classic - -apps: - dotnet: - command: dotnet - -architectures: - - build-on: [amd64] - run-on: [armhf] - -base: core - -parts: - dotnet-sdk: - plugin: dump - source: https://download.visualstudio.microsoft.com/download/pr/ccbcbf70-9911-40b1-a8cf-e018a13e720e/03c0621c6510f9c6f4cca6951f2cc1a4/dotnet-sdk-3.1.201-linux-arm.tar.gz - source-checksum: sha512/f37d0e55c9f593c6951bea5a6bb1ea3194486956efe08a2a0f266b419d912cdcbf4ac279358976f0bfa1fe560c333ca5d5437f8e8c718bb5963991e4395e0cd7 - stage-packages: - - libicu55 - - libssl1.0.0 - - libcurl3 - - libgssapi-krb5-2 - - libstdc++6 - - zlib1g - - libgcc1 - - libtinfo5 - - liblttng-ust0 - - liburcu4 - - runtime-wrapper: - plugin: dump - source: . - diff --git a/src/installer/pkg/packaging/snaps/arm/dotnet-sdk-5.0/snap/snapcraft.yaml b/src/installer/pkg/packaging/snaps/arm/dotnet-sdk-5.0/snap/snapcraft.yaml deleted file mode 100644 index c9e2ab7efb6c2..0000000000000 --- a/src/installer/pkg/packaging/snaps/arm/dotnet-sdk-5.0/snap/snapcraft.yaml +++ /dev/null @@ -1,40 +0,0 @@ -name: dotnet-sdk -version: 5.0.100-preview.2.20176.6 -summary: Cross-Platform .NET Core SDK -description: | - .NET Core SDK. https://dot.net/core. - -grade: stable -confinement: classic - -apps: - dotnet: - command: dotnet - -architectures: - - build-on: [amd64] - run-on: [armhf] - -base: core - -parts: - dotnet-sdk: - plugin: dump - source: https://download.visualstudio.microsoft.com/download/pr/f87574ee-c128-4e91-b436-68c99d801daf/b296bea9d987a4edaa71df47cd2e7aca/dotnet-sdk-5.0.100-preview.2.20176.6-linux-arm64.tar.gz - source-checksum: sha512/53cbf213e2e97b909b256d931f061178f26e5647424f144266d4af2e12d6443ef7398207a8f4e6f220c61db9ce49de3dc09d88417288a6a61d9b05e1def6b279 - stage-packages: - - libicu55 - - libssl1.0.0 - - libcurl3 - - libgssapi-krb5-2 - - libstdc++6 - - zlib1g - - libgcc1 - - libtinfo5 - - liblttng-ust0 - - liburcu4 - - runtime-wrapper: - plugin: dump - source: . - diff --git a/src/installer/pkg/packaging/snaps/arm64/dotnet-sdk-5.0/snap/snapcraft.yaml b/src/installer/pkg/packaging/snaps/arm64/dotnet-sdk-5.0/snap/snapcraft.yaml deleted file mode 100644 index 94a9af147619c..0000000000000 --- a/src/installer/pkg/packaging/snaps/arm64/dotnet-sdk-5.0/snap/snapcraft.yaml +++ /dev/null @@ -1,40 +0,0 @@ -name: dotnet-sdk -version: 5.0.100-preview.2.20176.6 -summary: Cross-Platform .NET Core SDK -description: | - .NET Core SDK. https://dot.net/core. - -grade: stable -confinement: classic - -apps: - dotnet: - command: dotnet - -architectures: - - build-on: [amd64] - run-on: [arm64] - -base: core18 - -parts: - dotnet-sdk: - plugin: dump - source: https://download.visualstudio.microsoft.com/download/pr/f87574ee-c128-4e91-b436-68c99d801daf/b296bea9d987a4edaa71df47cd2e7aca/dotnet-sdk-5.0.100-preview.2.20176.6-linux-arm64.tar.gz - source-checksum: sha512/53cbf213e2e97b909b256d931f061178f26e5647424f144266d4af2e12d6443ef7398207a8f4e6f220c61db9ce49de3dc09d88417288a6a61d9b05e1def6b279 - stage-packages: - - libicu60 - - libssl1.0.0 - - libcurl3 - - libgssapi-krb5-2 - - libstdc++6 - - zlib1g - - libgcc1 - - libtinfo5 - - liblttng-ust0 - - liburcu6 - - runtime-wrapper: - plugin: dump - source: . - diff --git a/src/installer/pkg/packaging/snaps/dotnet-runtime-2.1/snap/snapcraft.yaml b/src/installer/pkg/packaging/snaps/dotnet-runtime-2.1/snap/snapcraft.yaml deleted file mode 100644 index bfd43ef2e9934..0000000000000 --- a/src/installer/pkg/packaging/snaps/dotnet-runtime-2.1/snap/snapcraft.yaml +++ /dev/null @@ -1,45 +0,0 @@ -name: dotnet-runtime-21 -base: core18 -version: 2.1.15 -summary: Cross-Platform .NET Core Runtime. -description: | - .NET Core runtimes and libraries which are optimized for running .NET Core apps in production. See https://dot.net/core. - .NET Core is a general purpose development platform maintained by Microsoft. - -grade: stable -confinement: strict - -apps: - dotnet: - command: dotnet - plugs: - - network - - network-bind - - removable-media - - home - -slots: - dotnet-runtime: - content: dotnet-runtime-21 - interface: content - read: [/] - -parts: - dotnet-runtime: - plugin: dump - source: https://download.visualstudio.microsoft.com/download/pr/d2fb0b54-01ce-452c-b2a2-86dbef286265/055ad7740827cbe862d14ceb7ea54fac/dotnet-runtime-2.1.15-linux-x64.tar.gz - source-checksum: sha512/cfd7f7caea7e896dd4d68a05c827c86f38595f24e854edb3f934715ee1268e2623f17ff768215e465fe596cd474497384be2b1381f04ddd6d555665a341f65f6 - stage-packages: - - libicu60 - - libssl1.0.0 - - libcurl3 - - libgssapi-krb5-2 - - liblttng-ust0 - - libstdc++6 - - zlib1g - - libgcc1 - - lldb - - libunwind8 - - libtinfo5 - - libdb5.3 - - libc6 \ No newline at end of file diff --git a/src/installer/pkg/packaging/snaps/dotnet-runtime-3.0/snap/snapcraft.yaml b/src/installer/pkg/packaging/snaps/dotnet-runtime-3.0/snap/snapcraft.yaml deleted file mode 100644 index 9276af3d01f02..0000000000000 --- a/src/installer/pkg/packaging/snaps/dotnet-runtime-3.0/snap/snapcraft.yaml +++ /dev/null @@ -1,45 +0,0 @@ -name: dotnet-runtime-30 -base: core18 -version: 3.0.2 -summary: Cross-Platform .NET Core Runtime. -description: | - .NET Core runtimes and libraries which are optimized for running .NET Core apps in production. See https://dot.net/core. - .NET Core is a general purpose development platform maintained by Microsoft. - -grade: stable -confinement: strict - -apps: - dotnet: - command: dotnet - plugs: - - network - - network-bind - - removable-media - - home - -slots: - dotnet-runtime: - content: dotnet-runtime-30 - interface: content - read: [/] - -parts: - dotnet-runtime: - plugin: dump - source: https://download.visualstudio.microsoft.com/download/pr/7647815e-9c28-40a5-96ea-c6ac4ebe2020/c026b1e93a5d6750a7666d3fe36a87f5/dotnet-runtime-3.0.2-linux-x64.tar.gz - source-checksum: sha512/c8f0e4eb220fa896c4a803a8d9d0c704ae7b8383801a977036f3089b1d779159f5a2d9293dc11ff5f4f6c76febc6f70f6cfcdff0debd3243cad5eb635f853d45 - stage-packages: - - libicu60 - - libssl1.0.0 - - libcurl3 - - libgssapi-krb5-2 - - liblttng-ust0 - - libstdc++6 - - zlib1g - - libgcc1 - - lldb - - libunwind8 - - libtinfo5 - - libdb5.3 - - libc6 \ No newline at end of file diff --git a/src/installer/pkg/packaging/snaps/dotnet-runtime-3.1/snap/snapcraft.yaml b/src/installer/pkg/packaging/snaps/dotnet-runtime-3.1/snap/snapcraft.yaml deleted file mode 100644 index a81092e3026fd..0000000000000 --- a/src/installer/pkg/packaging/snaps/dotnet-runtime-3.1/snap/snapcraft.yaml +++ /dev/null @@ -1,43 +0,0 @@ -name: dotnet-runtime-31 -base: core18 -version: 3.1.1 -summary: Cross-Platform .NET Core Runtime. -description: | - .NET Core runtimes and libraries which are optimized for running .NET Core apps in production. See https://dot.net/core. - .NET Core is a general purpose development platform maintained by Microsoft. - -grade: stable -confinement: strict - -apps: - dotnet: - command: dotnet - plugs: - - network - - network-bind - - removable-media - - home - -slots: - dotnet-runtime: - content: dotnet-runtime-31 - interface: content - read: [/] - -parts: - dotnet-runtime: - plugin: dump - source: https://download.visualstudio.microsoft.com/download/pr/e060c2eb-1476-4d70-857c-24f5eead2070/ff0e007b7373c04f754b3818ffdb2134/dotnet-runtime-3.1.1-linux-x64.tar.gz - source-checksum: sha512/991a89ac7b52d3bf6c00359ce94c5a3f7488cd3d9e4663ba0575e1a5d8214c5fcc459e2cb923c369c2cdb789a96f0b1dfb5c5aae1a04df6e7f1f365122072611 - stage-packages: - - libicu60 - - libssl1.0.0 - - libcurl3 - - libgssapi-krb5-2 - - liblttng-ust0 - - libstdc++6 - - zlib1g - - libgcc1 - - libtinfo5 - - libdb5.3 - - libc6 \ No newline at end of file diff --git a/src/installer/pkg/packaging/snaps/dotnet-runtime-5.0/snap/snapcraft.yaml b/src/installer/pkg/packaging/snaps/dotnet-runtime-5.0/snap/snapcraft.yaml deleted file mode 100644 index 8dd11b75f409f..0000000000000 --- a/src/installer/pkg/packaging/snaps/dotnet-runtime-5.0/snap/snapcraft.yaml +++ /dev/null @@ -1,43 +0,0 @@ -name: dotnet-runtime-50 -base: core18 -version: 5.0.0-preview.2.20167.3 -summary: Cross-Platform .NET Core Runtime. -description: | - .NET Core runtimes and libraries which are optimized for running .NET Core apps in production. See https://dot.net/core. - .NET Core is a general purpose development platform maintained by Microsoft. - -grade: stable -confinement: strict - -apps: - dotnet: - command: dotnet - plugs: - - network - - network-bind - - removable-media - - home - -slots: - dotnet-runtime: - content: dotnet-runtime-50 - interface: content - read: [/] - -parts: - dotnet-runtime: - plugin: dump - source: https://download.visualstudio.microsoft.com/download/pr/169871b7-ce8f-4518-a342-209f98342569/4bb2abeecf4b064eac907fb28f96b5ca/aspnetcore-runtime-5.0.0-preview.2.20167.3-linux-x64.tar.gz - source-checksum: sha512/c155a94b463020f413b9cc6650219b27c08f331f9d1926966e4c4471b1a3cc79e199fbbd4747e8ad89bd03d66cd90cbc68a5554c54e931ac59f7508810303327 - stage-packages: - - libicu60 - - libssl1.0.0 - - libcurl3 - - libgssapi-krb5-2 - - liblttng-ust0 - - libstdc++6 - - zlib1g - - libgcc1 - - libtinfo5 - - libdb5.3 - - libc6 \ No newline at end of file diff --git a/src/installer/pkg/packaging/snaps/dotnet-sdk-2.1/snap/snapcraft.yaml b/src/installer/pkg/packaging/snaps/dotnet-sdk-2.1/snap/snapcraft.yaml deleted file mode 100644 index 66a40385f282e..0000000000000 --- a/src/installer/pkg/packaging/snaps/dotnet-sdk-2.1/snap/snapcraft.yaml +++ /dev/null @@ -1,37 +0,0 @@ -name: dotnet-sdk -version: 2.1.804 -summary: Cross-Platform .NET Core SDK -description: | - .NET Core SDK. https://dot.net/core. - -grade: stable -confinement: classic - -apps: - dotnet: - command: dotnet - -base: core18 - -parts: - dotnet-sdk: - plugin: dump - source: https://download.visualstudio.microsoft.com/download/pr/9ba4d9b0-3fca-40ed-b5a2-1552dfa4f89e/8e5e555b543a7afd8fd764e080d25671/dotnet-sdk-2.1.804-linux-x64.tar.gz - source-checksum: sha512/82b039856dadd2b47fa56a262d1a1a389132f0db037d4ee5c0872f2949c2cd447c33a978e1f532783119aa416860e03f26b840863ca3a97392a4b77f8df5bf66 - stage-packages: - - libicu60 - - libssl1.0.0 - - libcurl3 - - libgssapi-krb5-2 - - libstdc++6 - - zlib1g - - libgcc1 - - libtinfo5 - - liblttng-ust0 - - liburcu6 - - lldb - - runtime-wrapper: - plugin: dump - source: . - diff --git a/src/installer/pkg/packaging/snaps/dotnet-sdk-3.1/snap/snapcraft.yaml b/src/installer/pkg/packaging/snaps/dotnet-sdk-3.1/snap/snapcraft.yaml deleted file mode 100644 index c5b5b1371f294..0000000000000 --- a/src/installer/pkg/packaging/snaps/dotnet-sdk-3.1/snap/snapcraft.yaml +++ /dev/null @@ -1,36 +0,0 @@ -name: dotnet-sdk -version: 3.1.200 -summary: Cross-Platform .NET Core SDK -description: | - .NET Core SDK. https://dot.net/core. - -grade: stable -confinement: classic - -apps: - dotnet: - command: dotnet - -base: core18 - -parts: - dotnet-sdk: - plugin: dump - source: https://download.visualstudio.microsoft.com/download/pr/daec2daf-b458-4ae1-9046-b8ba09b5fb49/733e2d73b41640d6e6bdf1cc6b9ef03b/dotnet-sdk-3.1.200-linux-x64.tar.gz - source-checksum: sha512/5b9398c7bfe7f67cd9f38fdd4e6e429e1b6aaac0fe04672be0f8dca26580fb46906fd1d2deea6a7d3fb07d77e898f067d3ac1805fe077dc7c1adf9515c9bc9a9 - stage-packages: - - libicu60 - - libssl1.0.0 - - libcurl3 - - libgssapi-krb5-2 - - libstdc++6 - - zlib1g - - libgcc1 - - libtinfo5 - - liblttng-ust0 - - liburcu6 - - runtime-wrapper: - plugin: dump - source: . - diff --git a/src/installer/pkg/packaging/snaps/dotnet-sdk-5.0/snap/snapcraft.yaml b/src/installer/pkg/packaging/snaps/dotnet-sdk-5.0/snap/snapcraft.yaml deleted file mode 100644 index 02eaa69deef59..0000000000000 --- a/src/installer/pkg/packaging/snaps/dotnet-sdk-5.0/snap/snapcraft.yaml +++ /dev/null @@ -1,36 +0,0 @@ -name: dotnet-sdk -version: 5.0.100-preview.2.20176.6 -summary: Cross-Platform .NET Core SDK -description: | - .NET Core SDK. https://dot.net/core. - -grade: stable -confinement: classic - -apps: - dotnet: - command: dotnet - -base: core18 - -parts: - dotnet-sdk: - plugin: dump - source: https://download.visualstudio.microsoft.com/download/pr/727a5825-d29a-4f45-beaa-053399f8b5ee/5f15827ceb4851ef87a008f5de0acf6c/dotnet-sdk-5.0.100-preview.2.20176.6-linux-x64.tar.gz - source-checksum: sha512/fface8ff5facdec10d11f8249b426a71cd5bc17aa4e4b1fbe85f4a462e55bdb648a456973a3257f0a700be1aeb0f9bb41639ceca12c2e67d1571e4544ae62bd7 - stage-packages: - - libicu60 - - libssl1.0.0 - - libcurl3 - - libgssapi-krb5-2 - - libstdc++6 - - zlib1g - - libgcc1 - - libtinfo5 - - liblttng-ust0 - - liburcu6 - - runtime-wrapper: - plugin: dump - source: . - diff --git a/src/installer/pkg/packaging/snaps/dotnet-sdk/dotnet-runtime b/src/installer/pkg/packaging/snaps/dotnet-sdk/dotnet-runtime deleted file mode 100755 index 31ac85be70543..0000000000000 --- a/src/installer/pkg/packaging/snaps/dotnet-sdk/dotnet-runtime +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -dotnet_runtime_snaps=$(ls "$SNAP/../.." | grep dotnet-runtime) - -for snap in "$dotnet_runtime_snaps" -do - runtime_dir=$(realpath "$SNAP/../../$snap/current/shared/Microsoft.NETCore.App") - if [ -d "$runtime_dir" ]; then - runtime_version=$(ls "$runtime_dir") - runtime_path="$SNAP_DATA/Microsoft.NETCore.App/$runtime_version" - if [ ! -d "$runtime_path" ]; then - sudo ln -s "$runtime_dir/$runtime_version" "$runtime_path" - fi - fi -done - -exec $SNAP/dotnet "$@" diff --git a/src/installer/pkg/packaging/snaps/dotnet-sdk/snap/snapcraft.yaml b/src/installer/pkg/packaging/snaps/dotnet-sdk/snap/snapcraft.yaml deleted file mode 100644 index 8f9c7cc3fe823..0000000000000 --- a/src/installer/pkg/packaging/snaps/dotnet-sdk/snap/snapcraft.yaml +++ /dev/null @@ -1,36 +0,0 @@ -name: dotnet-sdk -version: $(DOTNET_SDK_VERSION) -summary: Cross-Platform .NET Core SDK -description: | - .NET Core SDK. https://dot.net/core. - -grade: devel -confinement: classic - -apps: - dotnet: - command: dotnet - -base: core18 - -parts: - dotnet-sdk: - plugin: dump - source: $(SOURCE_TARGZ) - source-checksum: sha512/$(SOURCE_TARGZ_SHA) - stage-packages: - - libicu60 - - libssl1.0.0 - - libcurl3 - - libgssapi-krb5-2 - - libstdc++6 - - zlib1g - - libgcc1 - - lldb - - libunwind8 - - libtinfo5 - - liblttng-ust0 - - liburcu6 - runtime-wrapper: - plugin: dump - source: . diff --git a/src/installer/pkg/packaging/version_badge.svg b/src/installer/pkg/packaging/version_badge.svg deleted file mode 100644 index 956523b78df3c..0000000000000 --- a/src/installer/pkg/packaging/version_badge.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - version - version - ver_number - ver_number - - diff --git a/src/installer/pkg/packaging/vs-insertion-packages.proj b/src/installer/pkg/packaging/vs-insertion-packages.proj deleted file mode 100644 index fd69aea557f75..0000000000000 --- a/src/installer/pkg/packaging/vs-insertion-packages.proj +++ /dev/null @@ -1,21 +0,0 @@ - - - - - $(NetCoreAppCurrent) - - - - - - - - - - - - - diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/Microsoft.NETCore.DotNetAppHost.pkgproj b/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/Microsoft.NETCore.DotNetAppHost.pkgproj deleted file mode 100644 index a363542fa6251..0000000000000 --- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/Microsoft.NETCore.DotNetAppHost.pkgproj +++ /dev/null @@ -1,8 +0,0 @@ - - - AppHostVersion - true - - - - diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/Microsoft.NETCore.DotNetAppHost.props b/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/Microsoft.NETCore.DotNetAppHost.props deleted file mode 100644 index 3f6f90f8cf47a..0000000000000 --- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/Microsoft.NETCore.DotNetAppHost.props +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/Microsoft.NETCore.DotNetHost.pkgproj b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/Microsoft.NETCore.DotNetHost.pkgproj index e8e11eb273146..50aa1919abb0c 100644 --- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/Microsoft.NETCore.DotNetHost.pkgproj +++ b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/Microsoft.NETCore.DotNetHost.pkgproj @@ -4,50 +4,9 @@ HostVersion dotnet-host - true true
- - - $(SharedHostBrandName) - sharedhost - Dotnet_CLI_SharedHost - SharedHost - - $(IntermediateOutputPath)publishRoot/ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/Microsoft.NETCore.DotNetHostPolicy.pkgproj b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/Microsoft.NETCore.DotNetHostPolicy.pkgproj index ccca328154d66..203b5dcaebef3 100644 --- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/Microsoft.NETCore.DotNetHostPolicy.pkgproj +++ b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/Microsoft.NETCore.DotNetHostPolicy.pkgproj @@ -9,5 +9,11 @@ - + + + + runtimes/$(PackageTargetRuntime)/native + true + +
diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/Microsoft.NETCore.DotNetHostPolicy.props b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/Microsoft.NETCore.DotNetHostPolicy.props deleted file mode 100644 index 6b1b70b6c2063..0000000000000 --- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/Microsoft.NETCore.DotNetHostPolicy.props +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostResolver/Microsoft.NETCore.DotNetHostResolver.pkgproj b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostResolver/Microsoft.NETCore.DotNetHostResolver.pkgproj index bb16d54c5bce2..58653556eef24 100644 --- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostResolver/Microsoft.NETCore.DotNetHostResolver.pkgproj +++ b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostResolver/Microsoft.NETCore.DotNetHostResolver.pkgproj @@ -4,7 +4,6 @@ HostResolverVersion dotnet-hostfxr - true true @@ -12,40 +11,12 @@ - - - $(HostFxrBrandName) - hostfxr - Dotnet_CLI_HostFxr - HostFXR - - $(IntermediateOutputPath)publishRoot/ - - - - - - - - - - - - - - - - + + + + runtimes/$(PackageTargetRuntime)/native + true + + diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostResolver/Microsoft.NETCore.DotNetHostResolver.props b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostResolver/Microsoft.NETCore.DotNetHostResolver.props deleted file mode 100644 index 81d8d72da34c9..0000000000000 --- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostResolver/Microsoft.NETCore.DotNetHostResolver.props +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - diff --git a/src/installer/pkg/projects/descriptions.json b/src/installer/pkg/projects/descriptions.json index 4b4ae7f6d83b5..b262318a3b3c1 100644 --- a/src/installer/pkg/projects/descriptions.json +++ b/src/installer/pkg/projects/descriptions.json @@ -28,25 +28,5 @@ "Name": "Microsoft.NETCore.DotNetHost", "Description": "Provides an executable implementation of the Microsoft DotNet Framework and SDK launcher module", "CommonTypes": [ ] - }, - { - "Name": "Microsoft.NETCore", - "Description": "Provides a set of packages that can be used when building portable libraries on .NETCore based platforms.", - "CommonTypes": [ ] - }, - { - "Name": "Microsoft.NETCore.App", - "Description": "A set of .NET APIs that are included in the default .NET application model.", - "CommonTypes": [ ] - }, - { - "Name": "Microsoft.NETCore.App.Internal", - "Description": "Transport package for .NET App runtime assets.", - "CommonTypes": [ ] - }, - { - "Name": "Microsoft.NETCore.App.Ref", - "Description": "A set of .NET APIs that are included in the default .NET application model. Contains reference assemblies, documentation, and other design-time assets.", - "CommonTypes": [ ] } ] diff --git a/src/installer/pkg/projects/netcoreapp/Directory.Build.props b/src/installer/pkg/projects/netcoreapp/Directory.Build.props deleted file mode 100644 index 36885e8e8b63f..0000000000000 --- a/src/installer/pkg/projects/netcoreapp/Directory.Build.props +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - windows - Linux - OSX - iOS - tvOS - Android - Browser - FreeBSD - NetBSD - illumos - Solaris - $(CoreCLRTargetOS) - - - - dotnet - - - diff --git a/src/installer/pkg/projects/netcoreapp/pkg/Directory.Build.props b/src/installer/pkg/projects/netcoreapp/pkg/Directory.Build.props deleted file mode 100644 index 40e6a6f9e6375..0000000000000 --- a/src/installer/pkg/projects/netcoreapp/pkg/Directory.Build.props +++ /dev/null @@ -1,38 +0,0 @@ - - - true - - - - - - $(NetCoreAppCurrentBrandName) - $(NetCoreAppCurrentIdentifier) - $(NetCoreAppCurrentVersion) - $(SharedFrameworkName) - - - - - - - - - - - - - - - - - - - - - RuntimeIdentifier=$(PackageTargetRuntime) - - - diff --git a/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Crossgen2.pkgproj b/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Crossgen2.pkgproj deleted file mode 100644 index 32a1ce3ac47d7..0000000000000 --- a/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Crossgen2.pkgproj +++ /dev/null @@ -1,113 +0,0 @@ - - - - - crossgen2 - true - true - - - - - - $(ShortFrameworkName)-crossgen2-pack - $(Crossgen2PackBrandName) - Crossgen2Pack - - - - - $(MSBuildThisFileDirectory)crossgenRIDs.props - - - - - - - - - - - - - unix - win - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - tools - - - - - - - - - - - diff --git a/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Host.pkgproj b/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Host.pkgproj deleted file mode 100644 index 8daa78d3ec711..0000000000000 --- a/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Host.pkgproj +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - true - - diff --git a/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Ref.pkgproj b/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Ref.pkgproj deleted file mode 100644 index 450e84155921a..0000000000000 --- a/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Ref.pkgproj +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - true - - diff --git a/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Runtime.pkgproj b/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Runtime.pkgproj deleted file mode 100644 index 003e5b8c52b9d..0000000000000 --- a/src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Runtime.pkgproj +++ /dev/null @@ -1,16 +0,0 @@ - - - - - true - - - - - diff --git a/src/installer/pkg/projects/netcoreapp/pkg/crossgenRIDs.props b/src/installer/pkg/projects/netcoreapp/pkg/crossgenRIDs.props deleted file mode 100644 index f10ef9947ce63..0000000000000 --- a/src/installer/pkg/projects/netcoreapp/pkg/crossgenRIDs.props +++ /dev/null @@ -1,18 +0,0 @@ - - - - - false - - - - $(OutputRid) - - - - - - - - - diff --git a/src/installer/pkg/projects/netcoreapp/pkg/legacy/Directory.Build.props b/src/installer/pkg/projects/netcoreapp/pkg/legacy/Directory.Build.props deleted file mode 100644 index 03473f6c66f5b..0000000000000 --- a/src/installer/pkg/projects/netcoreapp/pkg/legacy/Directory.Build.props +++ /dev/null @@ -1,23 +0,0 @@ - - - - - true - build/$(NetCoreAppCurrent)/ - - false - - - - - - - - - - - - diff --git a/src/installer/pkg/projects/netcoreapp/pkg/legacy/Microsoft.NETCore.App.Internal.pkgproj b/src/installer/pkg/projects/netcoreapp/pkg/legacy/Microsoft.NETCore.App.Internal.pkgproj deleted file mode 100644 index a46f80401902f..0000000000000 --- a/src/installer/pkg/projects/netcoreapp/pkg/legacy/Microsoft.NETCore.App.Internal.pkgproj +++ /dev/null @@ -1,28 +0,0 @@ - - - - - $(MSBuildThisFileDirectory)Microsoft.NETCore.App.pkgproj - true - - - - - - - false - - - - - - - - - diff --git a/src/installer/pkg/projects/netcoreapp/pkg/legacy/Microsoft.NETCore.App.pkgproj b/src/installer/pkg/projects/netcoreapp/pkg/legacy/Microsoft.NETCore.App.pkgproj deleted file mode 100644 index 5636c4b32e44c..0000000000000 --- a/src/installer/pkg/projects/netcoreapp/pkg/legacy/Microsoft.NETCore.App.pkgproj +++ /dev/null @@ -1,34 +0,0 @@ - - - - - false - - true - - data/ - true - - - - - - - - - - - - - - - - - - - - - diff --git a/src/installer/pkg/projects/netcoreapp/pkg/workaround/Microsoft.NETCore.App.pkgproj b/src/installer/pkg/projects/netcoreapp/pkg/workaround/Microsoft.NETCore.App.pkgproj deleted file mode 100644 index d5ae432d189a4..0000000000000 --- a/src/installer/pkg/projects/netcoreapp/pkg/workaround/Microsoft.NETCore.App.pkgproj +++ /dev/null @@ -1,29 +0,0 @@ - - - - true - - - - - - - false - false - - - true - - false - - false - true - - - - - - - - - diff --git a/src/installer/pkg/projects/netcoreapp/sfx/Microsoft.NETCore.App.Bundle.bundleproj b/src/installer/pkg/projects/netcoreapp/sfx/Microsoft.NETCore.App.Bundle.bundleproj deleted file mode 100644 index b7c0b13386156..0000000000000 --- a/src/installer/pkg/projects/netcoreapp/sfx/Microsoft.NETCore.App.Bundle.bundleproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - - .NET Core Shared Framework Bundle Installer - - - - - - - - - - - - - diff --git a/src/installer/pkg/projects/netcoreapp/sfx/Microsoft.NETCore.App.SharedFx.sfxproj b/src/installer/pkg/projects/netcoreapp/sfx/Microsoft.NETCore.App.SharedFx.sfxproj deleted file mode 100644 index e2905a88d3703..0000000000000 --- a/src/installer/pkg/projects/netcoreapp/sfx/Microsoft.NETCore.App.SharedFx.sfxproj +++ /dev/null @@ -1,86 +0,0 @@ - - - - - Microsoft.NETCore.App - $(SfxIdentity).Internal - - - $(SharedFrameworkPublishDir) - - true - - - true - true - - - false - - - - - - - - - - - - - - - $(SharedFrameworkInstallerFile) - - - - - - - - - - - - - - - - - - - - - - - - - - - $(RestoreSources);$(LibrariesShippingPackagesDir) - $(RestoreSources);$(LibrariesNonShippingPackagesDir) - - - - $(RestoreSources);$(LibrariesAllConfigShippingPackagesDir) - $(RestoreSources);$(LibrariesAllConfigNonShippingPackagesDir) - - diff --git a/src/installer/pkg/projects/netcoreapp/src/localnetcoreapp.override.targets b/src/installer/pkg/projects/netcoreapp/src/localnetcoreapp.override.targets deleted file mode 100644 index 47b1b703c4249..0000000000000 --- a/src/installer/pkg/projects/netcoreapp/src/localnetcoreapp.override.targets +++ /dev/null @@ -1,126 +0,0 @@ - - - - - <_diaSymReaderPackageDir>$(NuGetPackageRoot)microsoft.diasymreader.native/$(MicrosoftDiaSymReaderNativeVersion)/ - - - - <_crossHostArch>x86 - - - <_crossHostArch>x64 - - - <_crossHostArch>x64 - - - <_crossHostArch>x64 - - - <_crossDir Condition="'$(_crossHostArch)' != ''">/$(_crossHostArch)_$(TargetArchitecture) - - - - - - - <_diaSymReaderAssembly Include="$(_diaSymReaderPackageDir)**\Microsoft.DiaSymReader.Native.*.dll" /> - - - - <_runtimeDirectory>$([MSBuild]::NormalizeDirectory('$(CoreCLRArtifactsPath)', 'sharedFramework')) - <_crossGenPath>$([MSBuild]::NormalizePath('$(CoreCLRArtifactsPath)', '$(CoreCLRCrossTargetComponentDirName)', 'sharedFramework', 'crossgen$(ApplicationFileExtension)')) - - - - <_coreLibDirectory>$(CoreCLRArtifactsPath) - <_fxLibDirectory>$(LibrariesSharedFrameworkBinArtifactsPath) - - - - <_jitPath>$([MSBuild]::NormalizePath('$(CoreCLRArtifactsPath)', '$(CoreCLRCrossTargetComponentDirName)', 'sharedFramework', '$(LibraryFilePrefix)clrjit$(LibraryFileExtension)')) - - - - <_diaSymReaderToolDir>%(_diaSymReaderAssembly.RootDir)%(_diaSymReaderAssembly.Directory) - - - - - <_diaSymReaderToolDir>$(IntermediateOutputPath) - - - - - <_crossgenPlatformDirectories Include="%(_filesToCrossGen.RootDir)%(_filesToCrossGen.Directory)" /> - - <_crossgenPlatformDirectories Include="$(_runtimeDirectory)" /> - <_crossgenPlatformDirectories Include="$(_coreLibDirectory)" /> - <_crossgenPlatformDirectories Include="$(_fxLibDirectory)" /> - - - - - <_pathSeparatorEscaped>$([MSBuild]::Escape($([System.IO.Path]::PathSeparator.ToString()))) - <_crossgenPlatformAssemblies>@(_crossgenPlatformDirectories->'%(Identity)', '$(_pathSeparatorEscaped)') - - - - - - - - - true - - - - - runtimes/$(PackageRID)/lib/$(PackageTargetFramework) - runtimes/$(PackageRID)/native - - - - %(RidSpecificFilesToPackage.TargetPath)/%(RidSpecificFilesToPackage.DestinationSubDirectory) - - - - - - - - - - - ref/$(PackageTargetFramework) - - - - <_docFilesToPackage Include="%(FilesToPackage.RootDir)%(FilesToPackage.Directory)**\%(FilesToPackage.FileName).xml" /> - - - ref/$(PackageTargetFramework)/%(RecursiveDir) - - - - - - - - - - - diff --git a/src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj b/src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj deleted file mode 100644 index 79bf46786a4c1..0000000000000 --- a/src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj +++ /dev/null @@ -1,115 +0,0 @@ - - - - Microsoft.NETCore.App - false - - - - - - - - - - - - - - - - - - - <_pastShimFiles Include="System.Globalization.Native.dylib" /> - <_pastShimFiles Include="System.Globalization.Native.so" /> - <_pastShimFiles Include="System.IO.Compression.Native.a" /> - <_pastShimFiles Include="System.IO.Compression.Native.dylib" /> - <_pastShimFiles Include="System.IO.Compression.Native.so" /> - <_pastShimFiles Include="System.Native.a" /> - <_pastShimFiles Include="System.Native.dylib" /> - <_pastShimFiles Include="System.Native.so" /> - <_pastShimFiles Include="System.Net.Http.Native.a" /> - <_pastShimFiles Include="System.Net.Http.Native.dylib" /> - <_pastShimFiles Include="System.Net.Http.Native.so" /> - <_pastShimFiles Include="System.Net.Security.Native.a" /> - <_pastShimFiles Include="System.Net.Security.Native.dylib" /> - <_pastShimFiles Include="System.Net.Security.Native.so" /> - <_pastShimFiles Include="System.Security.Cryptography.Native.Apple.a" /> - <_pastShimFiles Include="System.Security.Cryptography.Native.Apple.dylib" /> - <_pastShimFiles Include="System.Security.Cryptography.Native.OpenSsl.a" /> - <_pastShimFiles Include="System.Security.Cryptography.Native.OpenSsl.dylib" /> - <_pastShimFiles Include="System.Security.Cryptography.Native.OpenSsl.so" /> - - - - - - - - - - - - runtimes/$(PackageRID)/native - - - - tools - - - - runtimes/$(PackageRID)/native/cross - - - runtimes/$(PackageRID)/native/include/%(RecursiveDir) - - - - runtimes/$(CoreCLRCrossTargetComponentDirName)_$(TargetArchitecture)/native - - - tools/$(CoreCLRCrossTargetComponentDirName)_$(TargetArchitecture) - - - tools/$(CoreCLRCrossTargetComponentDirName)_$(TargetArchitecture) - - - tools/$(CoreCLRCrossTargetComponentDirName)_$(TargetArchitecture) - - - - - - - - - - - - - - - - - - - <_docFilesToPackage Include="$(ArtifactsBinDir)/docs/%(LibrariesRefAssemblies.FileName).xml" Condition="Exists('$(ArtifactsBinDir)/docs/%(LibrariesRefAssemblies.FileName).xml')"/> - - - - - - diff --git a/src/installer/pkg/sfx/Directory.Build.props b/src/installer/pkg/sfx/Directory.Build.props new file mode 100644 index 0000000000000..a078c899d8159 --- /dev/null +++ b/src/installer/pkg/sfx/Directory.Build.props @@ -0,0 +1,25 @@ + + + true + + + + + $(NetCoreAppCurrent) + + + $(RepoRoot)THIRD-PARTY-NOTICES.TXT + + https://go.microsoft.com/fwlink/?LinkID=799417 + https://dot.net + Microsoft + 2.12 + $(RepoRoot)LICENSE.TXT + Microsoft .NET + true + true + + + + diff --git a/src/installer/pkg/sfx/Directory.Build.targets b/src/installer/pkg/sfx/Directory.Build.targets new file mode 100644 index 0000000000000..0ea3761da20eb --- /dev/null +++ b/src/installer/pkg/sfx/Directory.Build.targets @@ -0,0 +1,19 @@ + + + + + $(PackageId) + Internal implementation package not meant for direct consumption. Please do not reference directly. + When using NuGet 3.x, this package requires at least version 3.4. + + + + + $(RuntimeDisclaimer) %0A$(SourceRevisionId) %0A$(MinimumNuGet3VersionDescription) + $(RuntimeDisclaimer) %0A$(Description) %0A$(SourceRevisionId) %0A$(MinimumNuGet3VersionDescription) + + + + diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props new file mode 100644 index 0000000000000..71ea5d2b395bc --- /dev/null +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props @@ -0,0 +1,403 @@ + + + + + Microsoft.NETCore.App + .NET Runtime + true + + + + + + + + + + + + + + + + + + + + + + + + <_pastShimFiles Include="System.Globalization.Native.dylib" /> + <_pastShimFiles Include="System.Globalization.Native.so" /> + <_pastShimFiles Include="System.IO.Compression.Native.a" /> + <_pastShimFiles Include="System.IO.Compression.Native.dylib" /> + <_pastShimFiles Include="System.IO.Compression.Native.so" /> + <_pastShimFiles Include="System.Native.a" /> + <_pastShimFiles Include="System.Native.dylib" /> + <_pastShimFiles Include="System.Native.so" /> + <_pastShimFiles Include="System.Net.Http.Native.a" /> + <_pastShimFiles Include="System.Net.Http.Native.dylib" /> + <_pastShimFiles Include="System.Net.Http.Native.so" /> + <_pastShimFiles Include="System.Net.Security.Native.a" /> + <_pastShimFiles Include="System.Net.Security.Native.dylib" /> + <_pastShimFiles Include="System.Net.Security.Native.so" /> + <_pastShimFiles Include="System.Security.Cryptography.Native.Apple.a" /> + <_pastShimFiles Include="System.Security.Cryptography.Native.Apple.dylib" /> + <_pastShimFiles Include="System.Security.Cryptography.Native.OpenSsl.a" /> + <_pastShimFiles Include="System.Security.Cryptography.Native.OpenSsl.dylib" /> + <_pastShimFiles Include="System.Security.Cryptography.Native.OpenSsl.so" /> + + + + + true + 10.0.19041.1 + 14.12.25830.2 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_hostArch>$(TargetArchitecture) + <_longNameTargetArch>$(TargetArchitecture) + <_hostArch Condition="'$(_hostArch)' == 'x64'">amd64 + <_longNameTargetArch Condition="'$(_longNameTargetArch)' == 'x64'">amd64 + + + <_hostArch>x86 + + + <_hostArch>amd64 + + + <_hostArch>amd64 + + diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.targets b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.targets new file mode 100644 index 0000000000000..be753f2b2723f --- /dev/null +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.targets @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj new file mode 100644 index 0000000000000..ed0ed5da583db --- /dev/null +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj @@ -0,0 +1,110 @@ + + + + + + true + RuntimePack + Microsoft.NETCore.App.Crossgen2 + Microsoft.NETCore.App.Crossgen2.$(RuntimeIdentifier) + dotnet-crossgen2 + crossgen2 + win-x64;linux-x64;linux-musl-x64 + false + + AddRuntimeFilesToPackage; + AddFrameworkFilesToPackage + + true + + false + tools/ + true + + + + unix + win + $(TargetOSComponent)-$(TargetArchitecture) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_diaSymArch Condition="'$(_hostArch)' != ''">$(_hostArch) + <_diaSymReaderPath>$(PkgMicrosoft_DiaSymReader_Native)/runtimes/win/native/Microsoft.DiaSymReader.Native.$(_diaSymArch).dll + <_diaSymReaderPathIfExists Condition="Exists('$(_diaSymReaderPath)')">$(_diaSymReaderPath) + + + + + + + + + + + + <_crossTargetJit Include="@(CoreCLRCrossTargetFiles)" Condition="'%(FileName)' == '$(LibraryFilePrefix)clrjit' and '%(Extension)' == '$(LibraryFileExtension)'" /> + <_clrjit Include="@(RuntimeFiles)" Condition="'%(FileName)' == '$(LibraryFilePrefix)clrjit' and '%(Extension)' == '$(LibraryFileExtension)'" /> + <_crossTargetCrossgen Include="@(CoreCLRCrossTargetFiles)" Condition="'%(FileName)' == 'crossgen' and '%(Extension)' == '$(ApplicationFileExtension)'" /> + <_crossgen Include="@(RuntimeFiles)" Condition="'%(FileName)' == 'crossgen' and '%(Extension)' == '$(ApplicationFileExtension)'" /> + + + + + + + + + + + + + + + + <_PackagedFilesToPublish Include="@(_FilesToPackage)" Condition="'%(_FilesToPackage.PackOnly)' != 'true'" /> + + + + + + diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Host.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Host.sfxproj new file mode 100644 index 0000000000000..b62fef82dd0db --- /dev/null +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Host.sfxproj @@ -0,0 +1,66 @@ + + + + + true + AppHostPack + true + dotnet-apphost-pack + dotnet-apphost-pack + NetCore.AppHostPack + + + + + + + + + + + + + + + + + + + + + + + + + <_SymbolFiles Condition="'$(TargetOS)' == 'windows'" + Include="@(NativeRuntimeAsset->'%(RootDir)%(Directory)PDB/%(Filename).pdb')" + IsSymbolFile="true" + IsNative="true" /> + <_SymbolFiles Condition="'$(TargetOS)' != 'windows'" + Include="@(NativeRuntimeAsset->'%(RootDir)%(Directory)PDB/%(Filename)%(Extension)%(SymbolFileExtension)')" + IsSymbolFile="true" + IsNative="true" /> + + + + + + + + + + + + + + + diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Ref.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Ref.sfxproj new file mode 100644 index 0000000000000..327ba6421fd6e --- /dev/null +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Ref.sfxproj @@ -0,0 +1,19 @@ + + + + + TargetingPack + true + dotnet-targeting-pack + dotnet-targeting-pack + NetCore.TargetingPack + A set of .NET APIs that are included in the default .NET application model. Contains reference assemblies, documentation, and other design-time assets. + + + + + + + + + diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj new file mode 100644 index 0000000000000..b1923524d4a8c --- /dev/null +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj @@ -0,0 +1,125 @@ + + + + + + RuntimePack + dotnet-runtime-internal + dotnet-runtime + dotnet-runtime-internal + true + dotnet-runtime-symbols + NetCore.SharedFramework + true + + AddRuntimeFilesToPackage; + AddFrameworkFilesToPackage + + true + false + + false + + true + true + The .NET Shared Framework + + + + Mono + + + Mono.LLVM + + + Mono.LLVM.AOT + + + $(SharedFrameworkName).Runtime.$(RuntimeSpecificFrameworkSuffix).$(RuntimeIdentifier) + + + + + + + + + + + + + + + + runtimes/$(RuntimeIdentifier)/native + + + + tools + + + + runtimes/$(RuntimeIdentifier)/native/cross + + + runtimes/$(RuntimeIdentifier)/native/include/%(RecursiveDir) + + + + runtimes/$(CoreCLRCrossTargetComponentDirName)_$(TargetArchitecture)/native + + + tools/$(CoreCLRCrossTargetComponentDirName)_$(TargetArchitecture) + + + tools/$(CoreCLRCrossTargetComponentDirName)_$(TargetArchitecture) + + + tools/$(CoreCLRCrossTargetComponentDirName)_$(TargetArchitecture) + + + + + + + + + + + + + <_diaSymArch Condition="'$(_hostArch)' != ''">$(_hostArch) + <_diaSymReaderPath>$(PkgMicrosoft_DiaSymReader_Native)/runtimes/win/native/Microsoft.DiaSymReader.Native.$(_diaSymArch).dll + <_diaSymReaderPathIfExists Condition="Exists('$(_diaSymReaderPath)')">$(_diaSymReaderPath) + + + + + + + + + + + + <_crossTargetJit Include="@(CoreCLRCrossTargetFiles)" Condition="'%(FileName)' == '$(LibraryFilePrefix)clrjit' and '%(Extension)' == '$(LibraryFileExtension)'" /> + <_clrjit Include="@(RuntimeFiles)" Condition="'%(FileName)' == '$(LibraryFilePrefix)clrjit' and '%(Extension)' == '$(LibraryFileExtension)'" /> + <_crossTargetCrossgen Include="@(CoreCLRCrossTargetFiles)" Condition="'%(FileName)' == 'crossgen' and '%(Extension)' == '$(ApplicationFileExtension)'" /> + <_crossgen Include="@(RuntimeFiles)" Condition="'%(FileName)' == 'crossgen' and '%(Extension)' == '$(ApplicationFileExtension)'" /> + + + + + + + + + diff --git a/src/installer/pkg/projects/netcoreapp/pkg/PackageOverrides.txt b/src/installer/pkg/sfx/Microsoft.NETCore.App/PackageOverrides.txt similarity index 100% rename from src/installer/pkg/projects/netcoreapp/pkg/PackageOverrides.txt rename to src/installer/pkg/sfx/Microsoft.NETCore.App/PackageOverrides.txt diff --git a/src/installer/pkg/sfx/bundle/Microsoft.NETCore.App.Bundle.bundleproj b/src/installer/pkg/sfx/bundle/Microsoft.NETCore.App.Bundle.bundleproj new file mode 100644 index 0000000000000..9d3caba9e8aed --- /dev/null +++ b/src/installer/pkg/sfx/bundle/Microsoft.NETCore.App.Bundle.bundleproj @@ -0,0 +1,39 @@ + + + + + true + .NET Core Shared Framework Bundle Installer + $(MSBuildProjectDirectory) + dotnet-runtime + dotnet-runtime + win-x86;win-x64;win-arm64;osx-x64 + Runtime + $(MSBuildProjectDirectory)/shared-framework-distribution-template.xml + com.microsoft.dotnet.Microsoft.NETCore.App.$(ProductVersion).osx.x64 + osx_resources + + + + + + + + + + + + + + + + + + + + diff --git a/src/installer/pkg/projects/netcoreapp/sfx/bundle.thm b/src/installer/pkg/sfx/bundle/bundle.thm similarity index 100% rename from src/installer/pkg/projects/netcoreapp/sfx/bundle.thm rename to src/installer/pkg/sfx/bundle/bundle.thm diff --git a/src/installer/pkg/projects/netcoreapp/sfx/bundle.wxl b/src/installer/pkg/sfx/bundle/bundle.wxl similarity index 100% rename from src/installer/pkg/projects/netcoreapp/sfx/bundle.wxl rename to src/installer/pkg/sfx/bundle/bundle.wxl diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/cs.lproj/conclusion.html b/src/installer/pkg/sfx/bundle/osx_resources/cs.lproj/conclusion.html similarity index 100% rename from src/installer/pkg/packaging/osx/sharedframework/resources/cs.lproj/conclusion.html rename to src/installer/pkg/sfx/bundle/osx_resources/cs.lproj/conclusion.html diff --git a/src/installer/pkg/packaging/osx/resources/cs.lproj/eula.rtf b/src/installer/pkg/sfx/bundle/osx_resources/cs.lproj/eula.rtf similarity index 100% rename from src/installer/pkg/packaging/osx/resources/cs.lproj/eula.rtf rename to src/installer/pkg/sfx/bundle/osx_resources/cs.lproj/eula.rtf diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/cs.lproj/welcome.html b/src/installer/pkg/sfx/bundle/osx_resources/cs.lproj/welcome.html similarity index 100% rename from src/installer/pkg/packaging/osx/sharedframework/resources/cs.lproj/welcome.html rename to src/installer/pkg/sfx/bundle/osx_resources/cs.lproj/welcome.html diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/de.lproj/conclusion.html b/src/installer/pkg/sfx/bundle/osx_resources/de.lproj/conclusion.html similarity index 100% rename from src/installer/pkg/packaging/osx/sharedframework/resources/de.lproj/conclusion.html rename to src/installer/pkg/sfx/bundle/osx_resources/de.lproj/conclusion.html diff --git a/src/installer/pkg/packaging/osx/resources/de.lproj/eula.rtf b/src/installer/pkg/sfx/bundle/osx_resources/de.lproj/eula.rtf similarity index 100% rename from src/installer/pkg/packaging/osx/resources/de.lproj/eula.rtf rename to src/installer/pkg/sfx/bundle/osx_resources/de.lproj/eula.rtf diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/de.lproj/welcome.html b/src/installer/pkg/sfx/bundle/osx_resources/de.lproj/welcome.html similarity index 100% rename from src/installer/pkg/packaging/osx/sharedframework/resources/de.lproj/welcome.html rename to src/installer/pkg/sfx/bundle/osx_resources/de.lproj/welcome.html diff --git a/src/installer/pkg/packaging/osx/hostfxr/resources/dotnetbackground.png b/src/installer/pkg/sfx/bundle/osx_resources/dotnetbackground.png similarity index 100% rename from src/installer/pkg/packaging/osx/hostfxr/resources/dotnetbackground.png rename to src/installer/pkg/sfx/bundle/osx_resources/dotnetbackground.png diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/en.lproj/conclusion.html b/src/installer/pkg/sfx/bundle/osx_resources/en.lproj/conclusion.html similarity index 100% rename from src/installer/pkg/packaging/osx/sharedframework/resources/en.lproj/conclusion.html rename to src/installer/pkg/sfx/bundle/osx_resources/en.lproj/conclusion.html diff --git a/src/installer/pkg/packaging/osx/resources/en.lproj/eula.rtf b/src/installer/pkg/sfx/bundle/osx_resources/en.lproj/eula.rtf similarity index 100% rename from src/installer/pkg/packaging/osx/resources/en.lproj/eula.rtf rename to src/installer/pkg/sfx/bundle/osx_resources/en.lproj/eula.rtf diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/en.lproj/welcome.html b/src/installer/pkg/sfx/bundle/osx_resources/en.lproj/welcome.html similarity index 100% rename from src/installer/pkg/packaging/osx/sharedframework/resources/en.lproj/welcome.html rename to src/installer/pkg/sfx/bundle/osx_resources/en.lproj/welcome.html diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/es.lproj/conclusion.html b/src/installer/pkg/sfx/bundle/osx_resources/es.lproj/conclusion.html similarity index 100% rename from src/installer/pkg/packaging/osx/sharedframework/resources/es.lproj/conclusion.html rename to src/installer/pkg/sfx/bundle/osx_resources/es.lproj/conclusion.html diff --git a/src/installer/pkg/packaging/osx/resources/es.lproj/eula.rtf b/src/installer/pkg/sfx/bundle/osx_resources/es.lproj/eula.rtf similarity index 100% rename from src/installer/pkg/packaging/osx/resources/es.lproj/eula.rtf rename to src/installer/pkg/sfx/bundle/osx_resources/es.lproj/eula.rtf diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/es.lproj/welcome.html b/src/installer/pkg/sfx/bundle/osx_resources/es.lproj/welcome.html similarity index 100% rename from src/installer/pkg/packaging/osx/sharedframework/resources/es.lproj/welcome.html rename to src/installer/pkg/sfx/bundle/osx_resources/es.lproj/welcome.html diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/fr.lproj/conclusion.html b/src/installer/pkg/sfx/bundle/osx_resources/fr.lproj/conclusion.html similarity index 100% rename from src/installer/pkg/packaging/osx/sharedframework/resources/fr.lproj/conclusion.html rename to src/installer/pkg/sfx/bundle/osx_resources/fr.lproj/conclusion.html diff --git a/src/installer/pkg/packaging/osx/resources/fr.lproj/eula.rtf b/src/installer/pkg/sfx/bundle/osx_resources/fr.lproj/eula.rtf similarity index 100% rename from src/installer/pkg/packaging/osx/resources/fr.lproj/eula.rtf rename to src/installer/pkg/sfx/bundle/osx_resources/fr.lproj/eula.rtf diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/fr.lproj/welcome.html b/src/installer/pkg/sfx/bundle/osx_resources/fr.lproj/welcome.html similarity index 100% rename from src/installer/pkg/packaging/osx/sharedframework/resources/fr.lproj/welcome.html rename to src/installer/pkg/sfx/bundle/osx_resources/fr.lproj/welcome.html diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/it.lproj/conclusion.html b/src/installer/pkg/sfx/bundle/osx_resources/it.lproj/conclusion.html similarity index 100% rename from src/installer/pkg/packaging/osx/sharedframework/resources/it.lproj/conclusion.html rename to src/installer/pkg/sfx/bundle/osx_resources/it.lproj/conclusion.html diff --git a/src/installer/pkg/packaging/osx/resources/it.lproj/eula.rtf b/src/installer/pkg/sfx/bundle/osx_resources/it.lproj/eula.rtf similarity index 100% rename from src/installer/pkg/packaging/osx/resources/it.lproj/eula.rtf rename to src/installer/pkg/sfx/bundle/osx_resources/it.lproj/eula.rtf diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/it.lproj/welcome.html b/src/installer/pkg/sfx/bundle/osx_resources/it.lproj/welcome.html similarity index 100% rename from src/installer/pkg/packaging/osx/sharedframework/resources/it.lproj/welcome.html rename to src/installer/pkg/sfx/bundle/osx_resources/it.lproj/welcome.html diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/ja.lproj/conclusion.html b/src/installer/pkg/sfx/bundle/osx_resources/ja.lproj/conclusion.html similarity index 100% rename from src/installer/pkg/packaging/osx/sharedframework/resources/ja.lproj/conclusion.html rename to src/installer/pkg/sfx/bundle/osx_resources/ja.lproj/conclusion.html diff --git a/src/installer/pkg/packaging/osx/resources/ja.lproj/eula.rtf b/src/installer/pkg/sfx/bundle/osx_resources/ja.lproj/eula.rtf similarity index 100% rename from src/installer/pkg/packaging/osx/resources/ja.lproj/eula.rtf rename to src/installer/pkg/sfx/bundle/osx_resources/ja.lproj/eula.rtf diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/ja.lproj/welcome.html b/src/installer/pkg/sfx/bundle/osx_resources/ja.lproj/welcome.html similarity index 100% rename from src/installer/pkg/packaging/osx/sharedframework/resources/ja.lproj/welcome.html rename to src/installer/pkg/sfx/bundle/osx_resources/ja.lproj/welcome.html diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/ko.lproj/conclusion.html b/src/installer/pkg/sfx/bundle/osx_resources/ko.lproj/conclusion.html similarity index 100% rename from src/installer/pkg/packaging/osx/sharedframework/resources/ko.lproj/conclusion.html rename to src/installer/pkg/sfx/bundle/osx_resources/ko.lproj/conclusion.html diff --git a/src/installer/pkg/packaging/osx/resources/ko.lproj/eula.rtf b/src/installer/pkg/sfx/bundle/osx_resources/ko.lproj/eula.rtf similarity index 100% rename from src/installer/pkg/packaging/osx/resources/ko.lproj/eula.rtf rename to src/installer/pkg/sfx/bundle/osx_resources/ko.lproj/eula.rtf diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/ko.lproj/welcome.html b/src/installer/pkg/sfx/bundle/osx_resources/ko.lproj/welcome.html similarity index 100% rename from src/installer/pkg/packaging/osx/sharedframework/resources/ko.lproj/welcome.html rename to src/installer/pkg/sfx/bundle/osx_resources/ko.lproj/welcome.html diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/pl.lproj/conclusion.html b/src/installer/pkg/sfx/bundle/osx_resources/pl.lproj/conclusion.html similarity index 100% rename from src/installer/pkg/packaging/osx/sharedframework/resources/pl.lproj/conclusion.html rename to src/installer/pkg/sfx/bundle/osx_resources/pl.lproj/conclusion.html diff --git a/src/installer/pkg/packaging/osx/resources/pl.lproj/eula.rtf b/src/installer/pkg/sfx/bundle/osx_resources/pl.lproj/eula.rtf similarity index 100% rename from src/installer/pkg/packaging/osx/resources/pl.lproj/eula.rtf rename to src/installer/pkg/sfx/bundle/osx_resources/pl.lproj/eula.rtf diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/pl.lproj/welcome.html b/src/installer/pkg/sfx/bundle/osx_resources/pl.lproj/welcome.html similarity index 100% rename from src/installer/pkg/packaging/osx/sharedframework/resources/pl.lproj/welcome.html rename to src/installer/pkg/sfx/bundle/osx_resources/pl.lproj/welcome.html diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/pt-br.lproj/conclusion.html b/src/installer/pkg/sfx/bundle/osx_resources/pt-br.lproj/conclusion.html similarity index 100% rename from src/installer/pkg/packaging/osx/sharedframework/resources/pt-br.lproj/conclusion.html rename to src/installer/pkg/sfx/bundle/osx_resources/pt-br.lproj/conclusion.html diff --git a/src/installer/pkg/packaging/osx/resources/pt-br.lproj/eula.rtf b/src/installer/pkg/sfx/bundle/osx_resources/pt-br.lproj/eula.rtf similarity index 100% rename from src/installer/pkg/packaging/osx/resources/pt-br.lproj/eula.rtf rename to src/installer/pkg/sfx/bundle/osx_resources/pt-br.lproj/eula.rtf diff --git a/src/installer/pkg/packaging/osx/sharedframework/resources/pt-br.lproj/welcome.html b/src/installer/pkg/sfx/bundle/osx_resources/pt-br.lproj/welcome.html similarity index 100% rename from src/installer/pkg/packaging/osx/sharedframework/resources/pt-br.lproj/welcome.html rename to src/installer/pkg/sfx/bundle/osx_resources/pt-br.lproj/welcome.html diff --git a/src/installer/pkg/packaging/osx/resources/ru.lproj/eula.rtf b/src/installer/pkg/sfx/bundle/osx_resources/ru.lproj/eula.rtf similarity index 100% rename from src/installer/pkg/packaging/osx/resources/ru.lproj/eula.rtf rename to src/installer/pkg/sfx/bundle/osx_resources/ru.lproj/eula.rtf diff --git a/src/installer/pkg/packaging/osx/resources/tr.lproj/eula.rtf b/src/installer/pkg/sfx/bundle/osx_resources/tr.lproj/eula.rtf similarity index 100% rename from src/installer/pkg/packaging/osx/resources/tr.lproj/eula.rtf rename to src/installer/pkg/sfx/bundle/osx_resources/tr.lproj/eula.rtf diff --git a/src/installer/pkg/packaging/osx/resources/zh-hans.lproj/eula.rtf b/src/installer/pkg/sfx/bundle/osx_resources/zh-hans.lproj/eula.rtf similarity index 100% rename from src/installer/pkg/packaging/osx/resources/zh-hans.lproj/eula.rtf rename to src/installer/pkg/sfx/bundle/osx_resources/zh-hans.lproj/eula.rtf diff --git a/src/installer/pkg/packaging/osx/resources/zh-hant.lproj/eula.rtf b/src/installer/pkg/sfx/bundle/osx_resources/zh-hant.lproj/eula.rtf similarity index 100% rename from src/installer/pkg/packaging/osx/resources/zh-hant.lproj/eula.rtf rename to src/installer/pkg/sfx/bundle/osx_resources/zh-hant.lproj/eula.rtf diff --git a/src/installer/pkg/sfx/bundle/shared-framework-distribution-template.xml b/src/installer/pkg/sfx/bundle/shared-framework-distribution-template.xml new file mode 100644 index 0000000000000..2a1f0b8c7242f --- /dev/null +++ b/src/installer/pkg/sfx/bundle/shared-framework-distribution-template.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/src/installer/pkg/projects/netcoreapp/sfx/theme/1028/bundle.wxl b/src/installer/pkg/sfx/bundle/theme/1028/bundle.wxl similarity index 100% rename from src/installer/pkg/projects/netcoreapp/sfx/theme/1028/bundle.wxl rename to src/installer/pkg/sfx/bundle/theme/1028/bundle.wxl diff --git a/src/installer/pkg/projects/netcoreapp/sfx/theme/1029/bundle.wxl b/src/installer/pkg/sfx/bundle/theme/1029/bundle.wxl similarity index 100% rename from src/installer/pkg/projects/netcoreapp/sfx/theme/1029/bundle.wxl rename to src/installer/pkg/sfx/bundle/theme/1029/bundle.wxl diff --git a/src/installer/pkg/projects/netcoreapp/sfx/theme/1031/bundle.wxl b/src/installer/pkg/sfx/bundle/theme/1031/bundle.wxl similarity index 100% rename from src/installer/pkg/projects/netcoreapp/sfx/theme/1031/bundle.wxl rename to src/installer/pkg/sfx/bundle/theme/1031/bundle.wxl diff --git a/src/installer/pkg/projects/netcoreapp/sfx/theme/1033/bundle.wxl b/src/installer/pkg/sfx/bundle/theme/1033/bundle.wxl similarity index 100% rename from src/installer/pkg/projects/netcoreapp/sfx/theme/1033/bundle.wxl rename to src/installer/pkg/sfx/bundle/theme/1033/bundle.wxl diff --git a/src/installer/pkg/projects/netcoreapp/sfx/theme/1036/bundle.wxl b/src/installer/pkg/sfx/bundle/theme/1036/bundle.wxl similarity index 100% rename from src/installer/pkg/projects/netcoreapp/sfx/theme/1036/bundle.wxl rename to src/installer/pkg/sfx/bundle/theme/1036/bundle.wxl diff --git a/src/installer/pkg/projects/netcoreapp/sfx/theme/1040/bundle.wxl b/src/installer/pkg/sfx/bundle/theme/1040/bundle.wxl similarity index 100% rename from src/installer/pkg/projects/netcoreapp/sfx/theme/1040/bundle.wxl rename to src/installer/pkg/sfx/bundle/theme/1040/bundle.wxl diff --git a/src/installer/pkg/projects/netcoreapp/sfx/theme/1041/bundle.wxl b/src/installer/pkg/sfx/bundle/theme/1041/bundle.wxl similarity index 100% rename from src/installer/pkg/projects/netcoreapp/sfx/theme/1041/bundle.wxl rename to src/installer/pkg/sfx/bundle/theme/1041/bundle.wxl diff --git a/src/installer/pkg/projects/netcoreapp/sfx/theme/1042/bundle.wxl b/src/installer/pkg/sfx/bundle/theme/1042/bundle.wxl similarity index 100% rename from src/installer/pkg/projects/netcoreapp/sfx/theme/1042/bundle.wxl rename to src/installer/pkg/sfx/bundle/theme/1042/bundle.wxl diff --git a/src/installer/pkg/projects/netcoreapp/sfx/theme/1045/bundle.wxl b/src/installer/pkg/sfx/bundle/theme/1045/bundle.wxl similarity index 100% rename from src/installer/pkg/projects/netcoreapp/sfx/theme/1045/bundle.wxl rename to src/installer/pkg/sfx/bundle/theme/1045/bundle.wxl diff --git a/src/installer/pkg/projects/netcoreapp/sfx/theme/1046/bundle.wxl b/src/installer/pkg/sfx/bundle/theme/1046/bundle.wxl similarity index 100% rename from src/installer/pkg/projects/netcoreapp/sfx/theme/1046/bundle.wxl rename to src/installer/pkg/sfx/bundle/theme/1046/bundle.wxl diff --git a/src/installer/pkg/projects/netcoreapp/sfx/theme/1049/bundle.wxl b/src/installer/pkg/sfx/bundle/theme/1049/bundle.wxl similarity index 100% rename from src/installer/pkg/projects/netcoreapp/sfx/theme/1049/bundle.wxl rename to src/installer/pkg/sfx/bundle/theme/1049/bundle.wxl diff --git a/src/installer/pkg/projects/netcoreapp/sfx/theme/1055/bundle.wxl b/src/installer/pkg/sfx/bundle/theme/1055/bundle.wxl similarity index 100% rename from src/installer/pkg/projects/netcoreapp/sfx/theme/1055/bundle.wxl rename to src/installer/pkg/sfx/bundle/theme/1055/bundle.wxl diff --git a/src/installer/pkg/projects/netcoreapp/sfx/theme/2052/bundle.wxl b/src/installer/pkg/sfx/bundle/theme/2052/bundle.wxl similarity index 100% rename from src/installer/pkg/projects/netcoreapp/sfx/theme/2052/bundle.wxl rename to src/installer/pkg/sfx/bundle/theme/2052/bundle.wxl diff --git a/src/installer/pkg/projects/netcoreapp/sfx/theme/3082/bundle.wxl b/src/installer/pkg/sfx/bundle/theme/3082/bundle.wxl similarity index 100% rename from src/installer/pkg/projects/netcoreapp/sfx/theme/3082/bundle.wxl rename to src/installer/pkg/sfx/bundle/theme/3082/bundle.wxl diff --git a/src/installer/pkg/sfx/installers.proj b/src/installer/pkg/sfx/installers.proj new file mode 100644 index 0000000000000..5e7d5908d7a56 --- /dev/null +++ b/src/installer/pkg/sfx/installers.proj @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/installer/pkg/sfx/installers/Directory.Build.targets b/src/installer/pkg/sfx/installers/Directory.Build.targets new file mode 100644 index 0000000000000..d108af94975de --- /dev/null +++ b/src/installer/pkg/sfx/installers/Directory.Build.targets @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/src/installer/pkg/sfx/installers/dotnet-host.proj b/src/installer/pkg/sfx/installers/dotnet-host.proj new file mode 100644 index 0000000000000..aa2563c72c922 --- /dev/null +++ b/src/installer/pkg/sfx/installers/dotnet-host.proj @@ -0,0 +1,64 @@ + + + true + true + dotnet-host + dotnet-host-internal + Host + NetCore.SharedHost + true + true + sharedhost + Dotnet_CLI_SharedHost + HostSrc + false + true + sharedhost + false + osx_scripts/host + The .NET Shared Host. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/installer/pkg/sfx/installers/dotnet-hostfxr.proj b/src/installer/pkg/sfx/installers/dotnet-hostfxr.proj new file mode 100644 index 0000000000000..da5edcaa54964 --- /dev/null +++ b/src/installer/pkg/sfx/installers/dotnet-hostfxr.proj @@ -0,0 +1,45 @@ + + + true + true + dotnet-hostfxr-internal + dotnet-hostfxr + dotnet-hostfxr-internal + Host FX Resolver + ToolPack + NetCore.HostFXR + true + hostfxr + Dotnet_CLI_HostFxr + HostFxrSrc + true + hostfxr + osx_scripts/hostfxr + The .NET HostFxr + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/installer/pkg/sfx/installers/dotnet-runtime-deps/Directory.Build.props b/src/installer/pkg/sfx/installers/dotnet-runtime-deps/Directory.Build.props new file mode 100644 index 0000000000000..a6ee5fb0c0739 --- /dev/null +++ b/src/installer/pkg/sfx/installers/dotnet-runtime-deps/Directory.Build.props @@ -0,0 +1,9 @@ + + + + + Runtime Dependencies + dotnet-runtime-deps + linux-$(TargetArchitecture) + + \ No newline at end of file diff --git a/src/installer/pkg/sfx/installers/dotnet-runtime-deps/Directory.Build.targets b/src/installer/pkg/sfx/installers/dotnet-runtime-deps/Directory.Build.targets new file mode 100644 index 0000000000000..946b645737655 --- /dev/null +++ b/src/installer/pkg/sfx/installers/dotnet-runtime-deps/Directory.Build.targets @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-centos.7.proj b/src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-centos.7.proj new file mode 100644 index 0000000000000..687887134c419 --- /dev/null +++ b/src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-centos.7.proj @@ -0,0 +1,10 @@ + + + false + centos.7 + + + + + + \ No newline at end of file diff --git a/src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-debian.proj b/src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-debian.proj new file mode 100644 index 0000000000000..1898ecbdfa6c6 --- /dev/null +++ b/src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-debian.proj @@ -0,0 +1,24 @@ + + + false + + + + + [ + "liblldb-3.5", + "liblldb-3.6" + ] + + + + + + + + + + + + \ No newline at end of file diff --git a/src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-fedora.27.proj b/src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-fedora.27.proj new file mode 100644 index 0000000000000..044f9326b4b79 --- /dev/null +++ b/src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-fedora.27.proj @@ -0,0 +1,10 @@ + + + false + fedora.27 + + + + + + \ No newline at end of file diff --git a/src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-opensuse.42.proj b/src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-opensuse.42.proj new file mode 100644 index 0000000000000..6453d117728d4 --- /dev/null +++ b/src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-opensuse.42.proj @@ -0,0 +1,10 @@ + + + false + opensuse.42 + + + + + + \ No newline at end of file diff --git a/src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-oraclelinux.7.proj b/src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-oraclelinux.7.proj new file mode 100644 index 0000000000000..76afbe1850cd8 --- /dev/null +++ b/src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-oraclelinux.7.proj @@ -0,0 +1,10 @@ + + + false + oraclelinux.7 + + + + + + \ No newline at end of file diff --git a/src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-rhel.7.proj b/src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-rhel.7.proj new file mode 100644 index 0000000000000..258b3696d7b69 --- /dev/null +++ b/src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-rhel.7.proj @@ -0,0 +1,10 @@ + + + false + rhel.7 + + + + + + \ No newline at end of file diff --git a/src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-sles.12.proj b/src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-sles.12.proj new file mode 100644 index 0000000000000..912692f5d7f26 --- /dev/null +++ b/src/installer/pkg/sfx/installers/dotnet-runtime-deps/dotnet-runtime-deps-sles.12.proj @@ -0,0 +1,10 @@ + + + false + sles.12 + + + + + + \ No newline at end of file diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/host.wxs b/src/installer/pkg/sfx/installers/host.wxs similarity index 100% rename from src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/host.wxs rename to src/installer/pkg/sfx/installers/host.wxs diff --git a/src/installer/pkg/packaging/osx/sharedhost/scripts/postinstall b/src/installer/pkg/sfx/installers/osx_scripts/host/postinstall old mode 100755 new mode 100644 similarity index 87% rename from src/installer/pkg/packaging/osx/sharedhost/scripts/postinstall rename to src/installer/pkg/sfx/installers/osx_scripts/host/postinstall index 531cb93fd382f..33d9db28f2fb9 --- a/src/installer/pkg/packaging/osx/sharedhost/scripts/postinstall +++ b/src/installer/pkg/sfx/installers/osx_scripts/host/postinstall @@ -2,6 +2,7 @@ # # Licensed to the .NET Foundation under one or more agreements. # The .NET Foundation licenses this file to you under the MIT license. +# See the LICENSE file in the project root for more information. # PACKAGE=$1 diff --git a/src/installer/pkg/packaging/osx/hostfxr/scripts/postinstall b/src/installer/pkg/sfx/installers/osx_scripts/hostfxr/postinstall old mode 100755 new mode 100644 similarity index 85% rename from src/installer/pkg/packaging/osx/hostfxr/scripts/postinstall rename to src/installer/pkg/sfx/installers/osx_scripts/hostfxr/postinstall index 2d0ceb8278693..b8c5e60b92d99 --- a/src/installer/pkg/packaging/osx/hostfxr/scripts/postinstall +++ b/src/installer/pkg/sfx/installers/osx_scripts/hostfxr/postinstall @@ -2,6 +2,7 @@ # # Licensed to the .NET Foundation under one or more agreements. # The .NET Foundation licenses this file to you under the MIT license. +# See the LICENSE file in the project root for more information. # PACKAGE=$1 diff --git a/src/installer/tests/Assets/TestProjects/Directory.Build.targets b/src/installer/tests/Assets/TestProjects/Directory.Build.targets index 71982e083164d..f6350ac71558b 100644 --- a/src/installer/tests/Assets/TestProjects/Directory.Build.targets +++ b/src/installer/tests/Assets/TestProjects/Directory.Build.targets @@ -2,16 +2,16 @@ - - - - + + + + diff --git a/src/installer/tests/Directory.Build.targets b/src/installer/tests/Directory.Build.targets index 7d93a09399835..6e2bc2f03f3d6 100644 --- a/src/installer/tests/Directory.Build.targets +++ b/src/installer/tests/Directory.Build.targets @@ -13,13 +13,9 @@ Set up the shared framework copy this set of tests should use. There's no known reason to have one per test project, but RepoDirectoriesProvider may need some tweaking to share. --> - - - - - + $([System.IO.Path]::DirectorySeparatorChar) - $([System.String]::Copy('$(TestsOutputDir)').Replace('/', '$(DirectorySeparatorChar)')) - $([System.String]::Copy('$(SystemPathTestsOutputDir)').Replace('\', '$(DirectorySeparatorChar)')) + $(TestsOutputDir.Replace('/', '$(DirectorySeparatorChar)')) + $(SystemPathTestsOutputDir.Replace('\', '$(DirectorySeparatorChar)')) $(NetCoreRoot) @@ -63,7 +59,7 @@ the same as the package's version. Fetch this directly from the project to avoid guesswork. --> @@ -102,24 +98,12 @@ --> - - - - - - - $(HostRuntimeIdentifier) diff --git a/src/installer/tests/HostActivation.Tests/SharedFxLookup.cs b/src/installer/tests/HostActivation.Tests/SharedFxLookup.cs index a33195e54174d..fd63e339ec05f 100644 --- a/src/installer/tests/HostActivation.Tests/SharedFxLookup.cs +++ b/src/installer/tests/HostActivation.Tests/SharedFxLookup.cs @@ -156,48 +156,5 @@ public void Multiple_SharedFxLookup_Uber_Wins_Over_NetCoreApp_On_PatchRollForwar .And.HaveStdErrContaining(Path.Combine("7777.0.0", "System.Collections.Immutable.dll")) .And.NotHaveStdErrContaining(Path.Combine("9999.1.0", "System.Collections.Immutable.dll")); } - - [Fact] - public void CoreClrLookup_WithNoDirectorySeparatorInDeps() - { - var fixture = SharedFxLookupPortableAppFixture - .Copy(); - - var dotnet = fixture.BuiltDotnet; - var appDll = fixture.TestProject.AppDll; - - string runtimeConfig = Path.Combine(fixture.TestProject.OutputDirectory, "SharedFxLookupPortableApp.runtimeconfig.json"); - SharedFramework.SetRuntimeConfigJson(runtimeConfig, "9999.0.0", null); - - // Add versions in the exe folders - SharedFramework.AddAvailableSharedFxVersions(_builtSharedFxDir, _exeSharedFxBaseDir, "9999.0.0"); - string sharedFxPath = Path.Combine(_exeSharedFxBaseDir, "9999.0.0"); - string sharedFxDepsJsonPath = Path.Combine(sharedFxPath, "Microsoft.NETCore.App.deps.json"); - - // Modify the .deps.json for Microsoft.NETCore.App FX - JObject root = JObject.Parse(File.ReadAllText(sharedFxDepsJsonPath)); - IEnumerable netCoreAppNativeAssets = root["targets"] - .Children().Where(p => p.Name.Contains("/")) - .Children().Children().OfType().Where(p => p.Name.Contains("runtime") && p.Name.Contains("Microsoft.NETCore.App")) - .Values()["native"].Children().OfType(); - - // Change the coreclr.dll asset to specify only "coreclr.dll" as the relative path (no directories). - string coreClrLibraryName = RuntimeInformationExtensions.GetSharedLibraryFileNameForCurrentPlatform("coreclr"); - JProperty coreClrProperty = netCoreAppNativeAssets.First(p => p.Name.Contains(coreClrLibraryName)); - JProperty newCoreClrProperty = new JProperty(coreClrProperty.Name.Substring(coreClrProperty.Name.LastIndexOf('/') + 1), coreClrProperty.Value); - coreClrProperty.Parent.Add(newCoreClrProperty); - coreClrProperty.Remove(); - - File.WriteAllText(sharedFxDepsJsonPath, root.ToString()); - - dotnet.Exec(appDll) - .WorkingDirectory(_currentWorkingDir) - .EnvironmentVariable("COREHOST_TRACE", "1") - .CaptureStdOut() - .CaptureStdErr() - .Execute() - .Should().Pass() - .And.HaveStdErrContaining($"CoreCLR path = '{Path.Combine(sharedFxPath, coreClrLibraryName)}'"); - } } } diff --git a/src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/NuGetArtifactTester.cs b/src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/NuGetArtifactTester.cs index d5d1aa12a8afc..4af9206f6b351 100644 --- a/src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/NuGetArtifactTester.cs +++ b/src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/NuGetArtifactTester.cs @@ -34,26 +34,12 @@ public static NuGetArtifactTester OpenOrNull( { id = id ?? project; - string nuspecPath = Path.Combine( - dirs.BaseArtifactsFolder, - "packages", - dirs.Configuration, - "specs", - $"{id}.nuspec"); - - if (!File.Exists(nuspecPath)) - { - return null; - } - - PackageIdentity builtIdentity = new NuspecReader(nuspecPath).GetIdentity(); - string nupkgPath = Path.Combine( dirs.BaseArtifactsFolder, "packages", dirs.Configuration, "Shipping", - $"{builtIdentity}.nupkg"); + $"{id}.{dirs.MicrosoftNETCoreAppVersion}.nupkg"); // If the nuspec exists, the nupkg should exist. Assert.True(File.Exists(nupkgPath)); @@ -106,10 +92,7 @@ public void IsRuntimePack() IsRuntimeSpecificPack(); HasOnlyTheseDataFiles( - "data/RuntimeList.xml", - "data/PlatformManifest.txt"); - - HasGoodPlatformManifest(); + "data/RuntimeList.xml"); ContainsFrameworkList("RuntimeList.xml"); } diff --git a/src/installer/tests/PrepareTestAssets/PrepareTestAssets.proj b/src/installer/tests/PrepareTestAssets/PrepareTestAssets.proj index 56ae5cbefef66..a93ca4447a0c6 100644 --- a/src/installer/tests/PrepareTestAssets/PrepareTestAssets.proj +++ b/src/installer/tests/PrepareTestAssets/PrepareTestAssets.proj @@ -4,12 +4,10 @@ - - - - - - - - - - - diff --git a/src/installer/tests/TestUtils/RepoDirectoriesProvider.cs b/src/installer/tests/TestUtils/RepoDirectoriesProvider.cs index 52b10e3e50c8a..507773773d30a 100644 --- a/src/installer/tests/TestUtils/RepoDirectoriesProvider.cs +++ b/src/installer/tests/TestUtils/RepoDirectoriesProvider.cs @@ -78,7 +78,7 @@ public RepoDirectoriesProvider( Path.Combine(RepoRoot, ".packages"); CorehostPackages = corehostPackages ?? Path.Combine(Artifacts, "corehost"); - BuiltDotnet = builtDotnet ?? Path.Combine(BaseObjFolder, osPlatformConfig, "sharedFrameworkPublish"); + BuiltDotnet = builtDotnet ?? Path.Combine(GetTestContextVariable("TEST_ARTIFACTS"), "sharedFrameworkPublish"); } public string GetTestContextVariable(string name)