diff --git a/Microsoft.DotNet.Cli.sln b/Microsoft.DotNet.Cli.sln
index 018a8b81c..3733528eb 100644
--- a/Microsoft.DotNet.Cli.sln
+++ b/Microsoft.DotNet.Cli.sln
@@ -231,6 +231,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-remove-package.Tests
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-add-package.Tests", "test\dotnet-add-package.Tests\dotnet-add-package.Tests.csproj", "{08A40B6A-F695-4EA9-AC8D-CF88FADEA796}"
EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "tool_fsc", "src\tool_fsharp\tool_fsc.csproj", "{602976C5-2477-4B4C-AD9A-1EAFB250529A}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
diff --git a/NuGet.Config b/NuGet.Config
index 329dde57d..11723f1b5 100644
--- a/NuGet.Config
+++ b/NuGet.Config
@@ -4,10 +4,10 @@
-
-
-
+
+
+
@@ -16,7 +16,6 @@
-
diff --git a/README.md b/README.md
index 4fca8b7f8..984eb555b 100644
--- a/README.md
+++ b/README.md
@@ -23,9 +23,9 @@ This project has adopted the code of conduct defined by the [Contributor Covenan
Build Status
------------
-|Ubuntu 14.04 / Linux Mint 17 |Ubuntu 16.04 | Ubuntu 16.10 |Debian 8 |Windows x64 |Windows x86 |macOS |CentOS 7.1 / Oracle Linux 7.1 |RHEL 7.2 | Linux x64 |
-|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:|
-|[![][ubuntu-14.04-build-badge]][ubuntu-14.04-build]|[![][ubuntu-16.04-build-badge]][ubuntu-16.04-build]|[![][ubuntu-16.10-build-badge]][ubuntu-16.10-build]|[![][debian-8-build-badge]][debian-8-build]|[![][win-x64-build-badge]][win-x64-build]|[![][win-x86-build-badge]][win-x86-build]|[![][osx-build-badge]][osx-build]|[![][centos-build-badge]][centos-build]|[![][rhel-build-badge]][rhel-build]|[![][linux-build-badge]][linux-build]|
+|Windows x64 |Windows x86 |Mac OS X |Linux x64 |Ubuntu 14.04 / Linux Mint 17 |Ubuntu 16.04 |Ubuntu 16.10 |Debian 8 |RHEL 7.2 |
+|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:|:------:|
+|[![][win-x64-build-badge]][win-x64-build]|[![][win-x86-build-badge]][win-x86-build]|[![][osx-build-badge]][osx-build]|[![][linux-build-badge]][linux-build]|[![][ubuntu-14.04-build-badge]][ubuntu-14.04-build]|[![][ubuntu-16.04-build-badge]][ubuntu-16.04-build]|[![][ubuntu-16.10-build-badge]][ubuntu-16.10-build]|[![][debian-8-build-badge]][debian-8-build]|[![][rhel-build-badge]][rhel-build]|
[win-x64-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5449/badge
[win-x64-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5449
@@ -33,6 +33,12 @@ Build Status
[win-x86-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5450/badge
[win-x86-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5450
+[osx-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5445/badge
+[osx-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5445
+
+[linux-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5603/badge
+[linux-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5603
+
[ubuntu-14.04-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5447/badge
[ubuntu-14.04-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5447
@@ -45,18 +51,9 @@ Build Status
[debian-8-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5442/badge
[debian-8-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5442
-[osx-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5445/badge
-[osx-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5445
-
-[centos-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5441/badge
-[centos-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5441
-
[rhel-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5446/badge
[rhel-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5446
-[linux-build-badge]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5603/badge
-[linux-build]: https://devdiv.visualstudio.com/DevDiv/_build?_a=completed&definitionId=5603
-
Installers and Binaries
-----------------------
@@ -67,26 +64,35 @@ In order to download just the .NET Core runtime without the SDK, please visit ht
> **Note:** please be aware that below installers are the **latest bits**. If you
> want to install the latest released versions, please check out the [section above](#looking-for-v1-of-the-net-core-tooling).
-| Platform | master
[![][version-badge]][version] |
+| Platform | Latest Daily Build
*master*
[![][version-badge]][version] |
| -------- | :-------------------------------------: |
| **Windows x64** | [Installer][win-x64-installer] - [Checksum][win-x64-installer-checksum]
[zip][win-x64-zip] - [Checksum][win-x64-zip-checksum] |
| **Windows x86** | [Installer][win-x86-installer] - [Checksum][win-x86-installer-checksum]
[zip][win-x86-zip] - [Checksum][win-x86-zip-checksum] |
| **Mac OS X** | [Installer][osx-installer] - [Checksum][osx-installer-checksum]
[tar.gz][osx-targz] - [Checksum][osx-targz-checksum] |
| **Linux x64** | [tar.gz][linux-targz] - [Checksum][linux-targz-checksum] |
-| **Ubuntu 14.04 / Linux Mint 17** | [Installer][ubuntu-14.04-installer] - [Checksum][ubuntu-14.04-installer-checksum]
*See Installer Note Below
tar.gz - See **Linux x64** |
-| **Ubuntu 16.04** | [Installer][ubuntu-16.04-installer] - [Checksum][ubuntu-16.04-installer-checksum]
*See Installer Note Below
tar.gz - See **Linux x64** |
-| **Ubuntu 16.10** | [Installer][ubuntu-16.10-installer] - [Checksum][ubuntu-16.10-installer-checksum]
*See Installer Note Below
tar.gz - See **Linux x64** |
-| **Debian 8** | [Installer][debian-8-installer] - [Checksum][debian-8-installer-checksum]
*See Installer Note Below
tar.gz - See **Linux x64** |
+| **Ubuntu 14.04 / Linux Mint 17** | [Installer][ubuntu-14.04-installer] - [Checksum][ubuntu-14.04-installer-checksum]
_see installer note below_1
tar.gz - See **Linux x64** |
+| **Ubuntu 16.04** | [Installer][ubuntu-16.04-installer] - [Checksum][ubuntu-16.04-installer-checksum]
_see installer note below_1
tar.gz - See **Linux x64** |
+| **Ubuntu 16.10** | [Installer][ubuntu-16.10-installer] - [Checksum][ubuntu-16.10-installer-checksum]
_see installer note below_1
tar.gz - See **Linux x64** |
+| **Debian 8** | [Installer][debian-8-installer] - [Checksum][debian-8-installer-checksum]
_see installer note below_1
tar.gz - See **Linux x64** |
+| **RHEL 7.2** | [Installer][rhel-7-installer] - [Checksum][rhel-7-installer-checksum]
_see installer note below_1
tar.gz - See **Linux x64** |
| **CentOS 7.1 / Oracle Linux 7** | tar.gz - See **Linux x64** |
-| **RHEL 7.2** | [Installer][rhel-7-installer] - [Checksum][rhel-7-installer-checksum]
*See Installer Note Below
tar.gz - See **Linux x64** |
| **Fedora 24** | tar.gz - See **Linux x64** |
| **OpenSUSE 42.1** | tar.gz - See **Linux x64** |
-*Note: Our Debian packages are put together slightly differently than the other OS specific installers. Instead of combining everything, we have separate component packages that depend on each other. If you're installing these directly from the .deb files (via dpkg or similar), then you'll need to install the [corresponding Host, Host FX Resolver, and Shared Framework packages](https://github.com/dotnet/core-setup#daily-builds) before installing the Sdk package.*
+
+| Latest Coherent Build2
*release/2.0.0* |
+|:------:|
+| [![][coherent-version-badge]][coherent-version] |
+
+Reference notes:
+> **1**: *Our Debian packages are put together slightly differently than the other OS specific installers. Instead of combining everything, we have separate component packages that depend on each other. If you're installing these directly from the .deb files (via dpkg or similar), then you'll need to install the [corresponding Host, Host FX Resolver, and Shared Framework packages](https://github.com/dotnet/core-setup#daily-builds) before installing the Sdk package.*
+>
**2**: *A 'coherent' build is defined as a build where the Runtime version matches between the CLI and Asp.NET.*
[version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/latest.version
+[coherent-version]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/latest.coherent.version
[comment]: # (The latest versions are always the same across all platforms. Just need one to show, so picking win-x64's svg.)
[version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/win_x64_Release_version_badge.svg
+[coherent-version-badge]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/win_x64_Release_coherent_badge.svg
[win-x64-installer]: https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-win-x64.exe
[win-x64-installer-checksum]: https://dotnetclichecksums.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-win-x64.exe.sha
diff --git a/build/Branding.props b/build/Branding.props
index 07d273737..823ace9de 100644
--- a/build/Branding.props
+++ b/build/Branding.props
@@ -1,6 +1,7 @@
Microsoft .NET Core SDK 2.1.0 - Preview 1
+ Microsoft .NET Core MSBuild Extensions - 2.1.0 Preview 1
Microsoft .NET Core Runtime 2.0.0
Microsoft .NET Core Host 2.0.0
Microsoft .NET Core Host FX Resolver 2.0.0
@@ -25,7 +26,7 @@
$(ArtifactNameCombinedHostHostFxrFrameworkSdk)-langpack
$(ArtifactNameSdk)-$(SdkVersion)-$(ProductMonikerRid)
-
+ dotnet-msbuild-extensions-$(SdkVersion)-$(ProductMonikerRid)
$(ArtifactNameSdkDebug)-$(SdkVersion)-$(ProductMonikerRid)
$(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(SdkVersion)-$(ProductMonikerRid)
diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props
index 685df5297..396c9f2df 100644
--- a/build/BundledRuntimes.props
+++ b/build/BundledRuntimes.props
@@ -31,7 +31,7 @@
- $(CoreSetupBlobRootUrl)aspnetcore/store/$(AspNetCoreRuntimeVersion)
+ $(CoreSetupBlobRootUrl)aspnetcore/store/$(AspNetCoreRuntimeAzureblobStoresSubfolderName)
runtime.version
$(PackagesDirectory)/$(AspNetCoreSharedRuntimeVersionFileName)
@@ -40,8 +40,8 @@
$(HostOSName)
linux
- -$(AspNetCoreCoherenceTimestamp)
- -$(AspNetCoherenceLabel)$(AspNetCoreRuntimeStoreSuffix)
+ -$(AspNetCoreRuntimePackageTimestamp)
+ -$(AspNetCoreRelease)$(AspNetCoreRuntimeStoreSuffix)
Build.RS.$(AspNetCoreRuntimeInstallerArchiveFileNameOSToken)$(AspNetCoreRuntimeInstallerArchiveSuffix)$(ArchiveExtension)
$(PackagesDirectory)/$(AspNetCoreRuntimeInstallerArchiveFileName)
diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index a3a15fb3b..a5a741915 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -1,44 +1,49 @@
- 2.0.0-preview3-25426-01
- 15.3.0-preview-000400-01
- 2.3.0-beta3-61816-04
+ 2.0.0-preview3-25518-01
+ 15.3.407
+ 2.3.0-beta4-61830-03
2.3.0-pre-20170624-6
1.6.0-beta2-25304
- 4.2.0-rc-170621-0
+ 4.2.0-rc-170630-0
4.4.1-pre-20170624-6
- 2.0.0-preview3-20170622-1
+ 2.0.0-preview3-20170717-1
$(CLI_NETSDK_Version)
- 4.3.0-preview3-4168
- 2.0.0-preview2-25331-02
- 2.0.0-rel-20170518-512
- 15.3.0-preview-20170618-03
+ 4.3.0-rtm-4315
+ 2.0.0-preview3-25514-04
+ 2.0.0-rel-20170629-588
+ 15.3.0-preview-20170703-02
$(CLI_SharedFrameworkVersion)
$(CLI_SharedFrameworkVersion)
$(CLI_SharedFrameworkVersion)
- 1.0.0-beta2-20170614-260
- 1.0.0-beta2-20170620-266
- 1.0.0-beta2-20170620-266
- 2.0.0-preview3-25426-01
- 2.0.0-preview3-25426-01
+ 1.0.0-beta2-20170719-291
+ 1.0.0-beta2-20170719-291
+ 1.0.0-beta2-20170719-291
+ 2.0.0-preview3-25518-01
+ 2.0.0-preview3-25518-01
0.1.1-alpha-167
1.2.1-alpha-002133
0.2.0
- 1.0.0-preview-000321
+ 1.0.0-preview-000409
0.2.0-beta-000042
- notimestamp
- 2.0.0-preview2-215
- preview2
- 25794
+ timestamped
+
+ 2.0.0
+ rtm
+ 2.0.0
+ 26380
+ aspnetcore-store
+ $(AspNetCoreVersion)-$(AspNetCoreRelease)
+ $(AspNetCoreBranchName)-$(AspNetCoreRuntimePackageTimestamp)
diff --git a/build/InstallerInfo.props b/build/InstallerInfo.props
index 6cc81f094..036369fab 100644
--- a/build/InstallerInfo.props
+++ b/build/InstallerInfo.props
@@ -2,11 +2,13 @@
$(PackagesDirectory)
$(InstallerOutputDirectory)/$(ArtifactNameWithVersionSdk)$(InstallerExtension)
+ $(InstallerOutputDirectory)/$(ArtifactNameWithVersionMSBuildExtensions)$(InstallerExtension)
$(InstallerOutputDirectory)/$(ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(BundleExtension)
$(IntermediateDirectory)/debian/sdk
$(SdkDebianIntermediateDirectory)/debianLayoutDirectory
$(IntermediateDirectory)/layouts
$(LayoutDirectory)/$(ArtifactNameSdk)
+ $(LayoutDirectory)/MSBuildExtensions
diff --git a/build/Publish.targets b/build/Publish.targets
index d38175d64..2fb513838 100644
--- a/build/Publish.targets
+++ b/build/Publish.targets
@@ -5,24 +5,27 @@
-
+
+
+ DependsOnTargets="GenerateVersionBadge;
+ GenerateCoherentBadge;
+ GatherItemsForPattern;
+ GenerateChecksums;
+ UploadArtifactsToAzure;
+ UploadChecksumsToAzure;
+ PublishDebFilesToDebianRepo;
+ PublishCliVersionBadge" />
@@ -44,6 +47,8 @@
+
diff --git a/build/Version.props b/build/Version.props
index 87443ab39..8285a0d26 100644
--- a/build/Version.props
+++ b/build/Version.props
@@ -3,7 +3,7 @@
2
1
0
- preview1
+ preview1
$(VersionMajor).$(VersionMinor).$(VersionPatch)-$(ReleaseSuffix)
$(VersionMajor).$(VersionMinor).$(VersionPatch).$(CommitCount)
diff --git a/build/VersionBadge.props b/build/VersionBadge.props
index 42f210be0..0dab52fb8 100644
--- a/build/VersionBadge.props
+++ b/build/VersionBadge.props
@@ -1,11 +1,14 @@
- $(OSName)_$(Architecture)
- ubuntu_16_04_x64
- ubuntu_16_10_x64
- fedora_24_x64
- opensuse_42_1_x64
+ $(OSName)_$(Architecture)
+ debian_8_x64
+ rhel_7_x64
+ ubuntu_14_04_x64
+ ubuntu_16_04_x64
+ ubuntu_16_10_x64
+ linux_x64
- $(BaseOutputDirectory)/$(VersionBadgeMoniker)_$(Configuration)_version_badge.svg
+ $(BaseOutputDirectory)/$(VersionBadgeMoniker)_$(Configuration)_version_badge.svg
+ $(BaseOutputDirectory)/$(VersionBadgeMoniker)_$(Configuration)_coherent_badge.svg
diff --git a/build/package/Archive.targets b/build/package/Archive.targets
index d0cd63ae1..d86e435fc 100644
--- a/build/package/Archive.targets
+++ b/build/package/Archive.targets
@@ -39,7 +39,7 @@
-
+
%(LayoutDefinition.OutputFiles)
$(ArchiveOutputDirectory)/%(LayoutDefinition.NameWithVersion)$(ArchiveExtension)
$(LayoutDirectory)/%(LayoutDefinition.Name)
diff --git a/build/package/Installer.DEB.proj b/build/package/Installer.DEB.proj
index 2c917db52..51efaca62 100644
--- a/build/package/Installer.DEB.proj
+++ b/build/package/Installer.DEB.proj
@@ -16,7 +16,8 @@
@@ -24,6 +25,7 @@
+
-
-
-
+
@@ -110,6 +105,7 @@
+
@@ -123,6 +119,7 @@
+
diff --git a/build/package/Installer.DEB.targets b/build/package/Installer.DEB.targets
index c67895054..879be4b8a 100644
--- a/build/package/Installer.DEB.targets
+++ b/build/package/Installer.DEB.targets
@@ -35,6 +35,10 @@
dotnet-hostfxr-$(HostFxrDebianPackageVersion)
$(HostFxrDebianPackageName.ToLower())
dotnet-host
+ $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp)
+ $(HostRid)
+ debian-x64
+ $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp)-$(HostRidInAspNetCoreRuntimeDebInstallerFileName).deb
@@ -83,6 +87,9 @@
$(SharedFxDebianPackageName)
+
+ $(AspNetCoreRuntimePackageName)
+
,
@@ -107,4 +114,14 @@
+
+
+
+ $(PackagesDirectory)/$(AspNetCoreRuntimeDebInstallerFileName)
+
+
+
diff --git a/build/package/Installer.MSI.targets b/build/package/Installer.MSI.targets
index 44f930c8b..2a4e131b8 100644
--- a/build/package/Installer.MSI.targets
+++ b/build/package/Installer.MSI.targets
@@ -17,6 +17,8 @@
$(RepoRoot)/packaging/windows/clisdk/generatebundle.ps1
$(RepoRoot)/packaging/windows/clisdk/generatenupkg.ps1
+ $(RepoRoot)/packaging/windows/msbuildextensions/generatemsi.ps1
+
$(RepoRoot)/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.$(Architecture).nuspec
$(InstallerOutputDirectory)/VS.Redist.Common.Net.Core.SDK.$(Architecture).$(FullNugetVersion).nupkg
@@ -36,11 +38,14 @@
+
+
+
+
+
+
@@ -103,6 +113,24 @@
'$(Architecture)'" />
+
+
+
+
+
dotnet-hostfxr-$(HostFxrRpmPackageVersion)
$(HostFxrRpmPackageName.ToLower())
dotnet-host
+ $(HostRid)
+ rhel-x64
+ $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp)
+ $(AspNetCoreVersion)-$(AspNetCoreRelease)-$(AspNetCoreRuntimePackageTimestamp)
+ $(AspNetCoreRuntimePackageBrandName)-$(AspNetCoreVersionAndRelease)-$(AspNetCoreRuntimePackageTimestamp)-$(HostRidInAspNetCoreRuntimeRpmInstallerFileName).rpm
@@ -74,7 +79,6 @@
-
-
-
$(SharedFrameworkVersion)
+
+ $(AspNetCoreRuntimePackageName)
+
+
+ $(AspNetCoreRuntimePackageVersion)
+
$(SharedFxRpmPackageName)
@@ -162,6 +166,16 @@
+
+
+ $(PackagesDirectory)/$(AspNetCoreRuntimeRpmInstallerFileName)
+
+
+
+
@@ -182,11 +196,12 @@
@@ -194,6 +209,7 @@
+
@@ -207,6 +223,8 @@
+
+
diff --git a/build/package/Layout.targets b/build/package/Layout.targets
index 6edb15076..8d37a5b36 100644
--- a/build/package/Layout.targets
+++ b/build/package/Layout.targets
@@ -17,6 +17,11 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -71,7 +92,13 @@
$(ArtifactNameWithVersionSdkLanguagePack)
$(ArtifactNameSdkLanguagePack)
+
+
+
+ @(CombinedMSBuildExtensionsInput)
+ @(CombinedMSBuildExtensionsRelativeOutputFiles -> '$(MSBuildExtensionsOutputDirectory)/%(Identity)')
+
diff --git a/build/publish/Badge.targets b/build/publish/Badge.targets
index 7c87a7ac6..d80313c19 100644
--- a/build/publish/Badge.targets
+++ b/build/publish/Badge.targets
@@ -14,4 +14,16 @@
ReplacementPatterns="ver_number"
ReplacementStrings="$(SdkVersion)" />
+
+
+
+
+
+
\ No newline at end of file
diff --git a/build/publish/FinishBuild.targets b/build/publish/FinishBuild.targets
index 69a9170ae..8ffbe0097 100644
--- a/build/publish/FinishBuild.targets
+++ b/build/publish/FinishBuild.targets
@@ -2,7 +2,6 @@
@@ -14,27 +13,6 @@
-
-
-
- false
- true
-
-
-
-
-
-
-
-
-
-
-
diff --git a/build/publish/PublishDebian.targets b/build/publish/PublishDebian.targets
index 08767a3ce..43ab5abda 100644
--- a/build/publish/PublishDebian.targets
+++ b/build/publish/PublishDebian.targets
@@ -19,7 +19,7 @@
-
+
diff --git a/build/publish/RuntimeCoherence.targets b/build/publish/RuntimeCoherence.targets
new file mode 100644
index 000000000..5ba7482bf
--- /dev/null
+++ b/build/publish/RuntimeCoherence.targets
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ false
+ true
+
+
+
diff --git a/build_projects/dotnet-cli-build/CheckIfAllBuildsHavePublished.cs b/build_projects/dotnet-cli-build/CheckIfAllBuildsHavePublished.cs
index 3335e482f..67b3ec6fe 100644
--- a/build_projects/dotnet-cli-build/CheckIfAllBuildsHavePublished.cs
+++ b/build_projects/dotnet-cli-build/CheckIfAllBuildsHavePublished.cs
@@ -52,7 +52,12 @@ namespace Microsoft.DotNet.Cli.Build
{ "win_x86", false },
{ "win_x64", false },
{ "osx_x64", false },
- { "linux_x64", false },
+ { "debian_8_x64", false },
+ { "rhel_7_x64", false },
+ { "ubuntu_14_04_x64", false },
+ { "ubuntu_16_04_x64", false },
+ { "ubuntu_16_10_x64", false },
+ { "linux_x64", false }
};
if (!badges.ContainsKey(VersionBadgeMoniker))
diff --git a/build_projects/dotnet-cli-build/EnvironmentVariableFilter.cs b/build_projects/dotnet-cli-build/EnvironmentVariableFilter.cs
index 5d5cdf9e3..6071d0765 100644
--- a/build_projects/dotnet-cli-build/EnvironmentVariableFilter.cs
+++ b/build_projects/dotnet-cli-build/EnvironmentVariableFilter.cs
@@ -28,6 +28,8 @@ namespace Microsoft.DotNet.Cli.Build
private IEnumerable _environmentVariablesToKeep = new string []
{
"DOTNET_CLI_TELEMETRY_SESSIONID",
+ "DOTNET_CLI_UI_LANGUAGE",
+ "DOTNET_MULTILEVEL_LOOKUP",
"DOTNET_RUNTIME_ID",
"DOTNET_SKIP_FIRST_TIME_EXPERIENCE",
"NUGET_PACKAGES"
diff --git a/packaging/deb/dotnet-debian_config.json b/packaging/deb/dotnet-debian_config.json
index 86adb7537..4d813f3fd 100644
--- a/packaging/deb/dotnet-debian_config.json
+++ b/packaging/deb/dotnet-debian_config.json
@@ -29,6 +29,7 @@
},
"debian_dependencies":{
- "%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME%" : {}%SHARED_FRAMEWORK_DEBIAN_PACKAGE_ADDITIONAL_DEPENDENCY%
+ "%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME%" : {}%SHARED_FRAMEWORK_DEBIAN_PACKAGE_ADDITIONAL_DEPENDENCY%,
+ "%ASPNETCOREPACKAGESTORE_DEBIAN_PACKAGE_NAME%": {}
}
}
diff --git a/packaging/deb/postinst b/packaging/deb/postinst
index 3ef09330a..e5ca8ee43 100755
--- a/packaging/deb/postinst
+++ b/packaging/deb/postinst
@@ -13,6 +13,10 @@ The .NET Core Tools include a telemetry feature that collects usage information.
The data collected is anonymous and will be published in an aggregated form for use by both Microsoft and community engineers under the Creative Commons Attribution License.
-The .NET Core Tools telemetry feature is enabled by default. You can opt-out of the telemetry feature by setting an environment variable DOTNET_CLI_TELEMETRY_OPTOUT (for example, 'export' on macOS/Linux, 'set' on Windows) to true (for example, 'true', 1). You can read more about .NET Core tools telemetry at https://aka.ms/dotnet-cli-telemetry."
+The .NET Core Tools telemetry feature is enabled by default. You can opt-out of the telemetry feature by setting an environment variable DOTNET_CLI_TELEMETRY_OPTOUT (for example, 'export' on macOS/Linux, 'set' on Windows) to true (for example, 'true', 1). You can read more about .NET Core tools telemetry at https://aka.ms/dotnet-cli-telemetry.
-dotnet new > /dev/null 2>&1 || true
+Installation Note
+--------------
+A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete."
+
+dotnet internal-reportinstallsuccess "debianpackage" > /dev/null 2>&1 || true
diff --git a/packaging/osx/clisdk/Distribution-Template b/packaging/osx/clisdk/Distribution-Template
index 9b53f10c3..f2e95c46d 100644
--- a/packaging/osx/clisdk/Distribution-Template
+++ b/packaging/osx/clisdk/Distribution-Template
@@ -6,9 +6,9 @@
-
+
-
+
@@ -32,4 +32,4 @@
{HostFxrComponentId}.pkg
{SharedHostComponentId}.pkg
{CLISdkComponentId}.pkg
-
\ No newline at end of file
+
diff --git a/packaging/osx/clisdk/scripts/postinstall b/packaging/osx/clisdk/scripts/postinstall
index 4d69748e9..1ec0bf6fa 100755
--- a/packaging/osx/clisdk/scripts/postinstall
+++ b/packaging/osx/clisdk/scripts/postinstall
@@ -11,7 +11,6 @@ INSTALL_DESTINATION=$2
# A temporary fix for the permissions issue(s)
chmod -R 755 $INSTALL_DESTINATION
-# Run 'dotnet new' to trigger the first time experience to initialize the cache
-$INSTALL_DESTINATION/dotnet new > /dev/null 2>&1 || true
+$INSTALL_DESTINATION/dotnet internal-reportinstallsuccess "$1" > /dev/null 2>&1 || true
exit 0
diff --git a/packaging/rpm/dotnet-config.json b/packaging/rpm/dotnet-config.json
index 6ed9d53ad..38f533bcb 100644
--- a/packaging/rpm/dotnet-config.json
+++ b/packaging/rpm/dotnet-config.json
@@ -25,14 +25,16 @@
{
"package_name": "%SHARED_HOST_RPM_NAME%",
"package_version": "%SHARED_HOST_RPM_VERSION%"
+ },
+ {
+ "package_name": "%ASPNETCOREPACKAGESTORE_RPM_PACKAGE_NAME%",
+ "package_version": "%ASPNETCOREPACKAGESTORE_RPM_PACKAGE_VERSION%"
}
],
"directories": [
"/usr/share/dotnet/sdk",
- "/usr/share/dotnet/store",
- "/usr/share/dotnet/additionalDeps",
"/usr/share/doc/%SDK_RPM_PACKAGE_NAME%"
],
"after_install_source": "scripts/after_install_host.sh",
"after_remove_source": "scripts/after_remove_host.sh"
-}
\ No newline at end of file
+}
diff --git a/packaging/rpm/scripts/after_install_host.sh b/packaging/rpm/scripts/after_install_host.sh
index 8b976c886..72980c801 100644
--- a/packaging/rpm/scripts/after_install_host.sh
+++ b/packaging/rpm/scripts/after_install_host.sh
@@ -17,6 +17,10 @@ The .NET Core Tools include a telemetry feature that collects usage information.
The data collected is anonymous and will be published in an aggregated form for use by both Microsoft and community engineers under the Creative Commons Attribution License.
-The .NET Core Tools telemetry feature is enabled by default. You can opt-out of the telemetry feature by setting an environment variable DOTNET_CLI_TELEMETRY_OPTOUT (for example, 'export' on macOS/Linux, 'set' on Windows) to true (for example, 'true', 1). You can read more about .NET Core tools telemetry at https://aka.ms/dotnet-cli-telemetry."
+The .NET Core Tools telemetry feature is enabled by default. You can opt-out of the telemetry feature by setting an environment variable DOTNET_CLI_TELEMETRY_OPTOUT (for example, 'export' on macOS/Linux, 'set' on Windows) to true (for example, 'true', 1). You can read more about .NET Core tools telemetry at https://aka.ms/dotnet-cli-telemetry.
-dotnet new > /dev/null 2>&1 || true
+Installation Note
+--------------
+A command will be run during the install process that will improve project restore speed and enable offline access. It will take up to a minute to complete."
+
+dotnet internal-reportinstallsuccess "rpmpackage" > /dev/null 2>&1 || true
diff --git a/packaging/windows/clisdk/bundle.wxs b/packaging/windows/clisdk/bundle.wxs
index d1de0ef58..4f379ca3e 100644
--- a/packaging/windows/clisdk/bundle.wxs
+++ b/packaging/windows/clisdk/bundle.wxs
@@ -37,6 +37,7 @@
+
diff --git a/packaging/windows/clisdk/dotnet.wxs b/packaging/windows/clisdk/dotnet.wxs
index 976bf5a55..315b801e5 100644
--- a/packaging/windows/clisdk/dotnet.wxs
+++ b/packaging/windows/clisdk/dotnet.wxs
@@ -30,12 +30,20 @@
-
-
+
+
-
-
+
+
diff --git a/packaging/windows/msbuildextensions/generatemsi.ps1 b/packaging/windows/msbuildextensions/generatemsi.ps1
new file mode 100644
index 000000000..a7444058d
--- /dev/null
+++ b/packaging/windows/msbuildextensions/generatemsi.ps1
@@ -0,0 +1,140 @@
+# Copyright (c) .NET Foundation and contributors. All rights reserved.
+# Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+param(
+ [Parameter(Mandatory=$true)][string]$inputDir,
+ [Parameter(Mandatory=$true)][string]$MSBuildExtensionsMSIOutput,
+ [Parameter(Mandatory=$true)][string]$WixRoot,
+ [Parameter(Mandatory=$true)][string]$ProductMoniker,
+ [Parameter(Mandatory=$true)][string]$DotnetMSIVersion,
+ [Parameter(Mandatory=$true)][string]$DotnetCLIDisplayVersion,
+ [Parameter(Mandatory=$true)][string]$DotnetCLINugetVersion,
+ [Parameter(Mandatory=$true)][string]$UpgradeCode,
+ [Parameter(Mandatory=$true)][string]$Architecture
+)
+
+. "$PSScriptRoot\..\..\..\scripts\common\_common.ps1"
+$RepoRoot = Convert-Path "$PSScriptRoot\..\..\.."
+
+$InstallFileswsx = "install-msbuild-extensions-files.wxs"
+$InstallFilesWixobj = "install-msbuild-extensions-files.wixobj"
+
+function RunHeat
+{
+ $result = $true
+ pushd "$WixRoot"
+
+ Write-Output Running heat..
+
+ .\heat.exe dir `"$inputDir`" -template fragment -sreg -gg -var var.DotnetSrc -cg InstallFiles -srd -dr MSBUILDEXTENSIONSHOME -out $InstallFileswsx | Out-Host
+
+ if($LastExitCode -ne 0)
+ {
+ $result = $false
+ Write-Output "Heat failed with exit code $LastExitCode."
+ }
+
+ popd
+ return $result
+}
+
+function RunCandle
+{
+ $result = $true
+ pushd "$WixRoot"
+
+ Write-Output Running candle..
+ $AuthWsxRoot = Join-Path $RepoRoot "packaging\windows\msbuildextensions"
+
+ .\candle.exe -nologo `
+ -dDotnetSrc="$inputDir" `
+ -dMicrosoftEula="$RepoRoot\packaging\windows\clisdk\dummyeula.rtf" `
+ -dProductMoniker="$ProductMoniker" `
+ -dBuildVersion="$DotnetMSIVersion" `
+ -dDisplayVersion="$DotnetCLIDisplayVersion" `
+ -dNugetVersion="$DotnetCLINugetVersion" `
+ -dUpgradeCode="$UpgradeCode" `
+ -arch "$Architecture" `
+ -ext WixDependencyExtension.dll `
+ "$AuthWsxRoot\msbuildextensions.wxs" `
+ "$AuthWsxRoot\provider.wxs" `
+ "$AuthWsxRoot\registrykeys.wxs" `
+ $InstallFileswsx | Out-Host
+
+ if($LastExitCode -ne 0)
+ {
+ $result = $false
+ Write-Output "Candle failed with exit code $LastExitCode."
+ }
+
+ popd
+ return $result
+}
+
+function RunLight
+{
+ $result = $true
+ pushd "$WixRoot"
+
+ Write-Output Running light..
+ $CabCache = Join-Path $WixRoot "cabcache"
+ $AuthWsxRoot = Join-Path $RepoRoot "packaging\windows\msbuildextensions"
+
+ .\light.exe -nologo -ext WixUIExtension -ext WixDependencyExtension -ext WixUtilExtension `
+ -cultures:en-us `
+ msbuildextensions.wixobj `
+ provider.wixobj `
+ registrykeys.wixobj `
+ $InstallFilesWixobj `
+ -b "$inputDir" `
+ -b "$AuthWsxRoot" `
+ -reusecab `
+ -cc "$CabCache" `
+ -out $MSBuildExtensionsMSIOutput | Out-Host
+
+ if($LastExitCode -ne 0)
+ {
+ $result = $false
+ Write-Output "Light failed with exit code $LastExitCode."
+ }
+
+ popd
+ return $result
+}
+
+if(!(Test-Path $inputDir))
+{
+ throw "$inputDir not found"
+}
+
+Write-Output "Creating MSBuild Extensions MSI at $MSBuildExtensionsMSIOutput"
+
+if([string]::IsNullOrEmpty($WixRoot))
+{
+ Exit -1
+}
+
+if(-Not (RunHeat))
+{
+ Exit -1
+}
+
+if(-Not (RunCandle))
+{
+ Exit -1
+}
+
+if(-Not (RunLight))
+{
+ Exit -1
+}
+
+if(!(Test-Path $MSBuildExtensionsMSIOutput))
+{
+ throw "Unable to create the MSBuild Extensions msi."
+ Exit -1
+}
+
+Write-Output -ForegroundColor Green "Successfully created MSBuild Extensions MSI - $MSBuildExtensionsMSIOutput"
+
+exit $LastExitCode
diff --git a/packaging/windows/msbuildextensions/msbuildextensions.wxs b/packaging/windows/msbuildextensions/msbuildextensions.wxs
new file mode 100644
index 000000000..be689ea3f
--- /dev/null
+++ b/packaging/windows/msbuildextensions/msbuildextensions.wxs
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/packaging/windows/msbuildextensions/provider.wxs b/packaging/windows/msbuildextensions/provider.wxs
new file mode 100644
index 000000000..e1711ec76
--- /dev/null
+++ b/packaging/windows/msbuildextensions/provider.wxs
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/packaging/windows/msbuildextensions/registrykeys.wxs b/packaging/windows/msbuildextensions/registrykeys.wxs
new file mode 100644
index 000000000..fde60d74a
--- /dev/null
+++ b/packaging/windows/msbuildextensions/registrykeys.wxs
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/packaging/windows/msbuildextensions/variables.wxi b/packaging/windows/msbuildextensions/variables.wxi
new file mode 100644
index 000000000..2d13e678f
--- /dev/null
+++ b/packaging/windows/msbuildextensions/variables.wxi
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/run-build.ps1 b/run-build.ps1
index d32bd1900..d3bb1152b 100644
--- a/run-build.ps1
+++ b/run-build.ps1
@@ -80,8 +80,8 @@ $env:VSTEST_TRACE_BUILD=1
# install a stage0
$dotnetInstallPath = Join-Path $RepoRoot "scripts\obtain\dotnet-install.ps1"
-Write-Output "$dotnetInstallPath -Channel ""release/2.0.0"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"" -Version 2.0.0-preview2-006437"
-Invoke-Expression "$dotnetInstallPath -Channel ""release/2.0.0"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"" -Version 2.0.0-preview2-006437"
+Write-Output "$dotnetInstallPath -Channel ""release/2.0.0"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"""
+Invoke-Expression "$dotnetInstallPath -Channel ""release/2.0.0"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"""
if ($LastExitCode -ne 0)
{
Write-Output "The .NET CLI installation failed with exit code $LastExitCode"
diff --git a/run-build.sh b/run-build.sh
index f1d42397a..95154cdf6 100755
--- a/run-build.sh
+++ b/run-build.sh
@@ -152,10 +152,10 @@ export VSTEST_TRACE_BUILD=1
# Don't resolve shared frameworks from user or global locations
-DOTNET_MULTILEVEL_LOOKUP=0
+export DOTNET_MULTILEVEL_LOOKUP=0
# Install a stage 0
-(set -x ; "$REPOROOT/scripts/obtain/dotnet-install.sh" --channel "release/2.0.0" --install-dir "$DOTNET_INSTALL_DIR" --architecture "$ARCHITECTURE" $LINUX_PORTABLE_INSTALL_ARGS --version "2.0.0-preview2-006437")
+(set -x ; "$REPOROOT/scripts/obtain/dotnet-install.sh" --channel "release/2.0.0" --install-dir "$DOTNET_INSTALL_DIR" --architecture "$ARCHITECTURE" $LINUX_PORTABLE_INSTALL_ARGS)
EXIT_CODE=$?
if [ $EXIT_CODE != 0 ]; then
diff --git a/scripts/docker/fedora.23/Dockerfile b/scripts/docker/fedora.23/Dockerfile
index 0c4b20d79..b8508bde7 100644
--- a/scripts/docker/fedora.23/Dockerfile
+++ b/scripts/docker/fedora.23/Dockerfile
@@ -4,36 +4,10 @@
#
# Dockerfile that creates a container suitable to build dotnet-cli
-FROM fedora:23
-
-# Install the base toolchain we need to build anything (clang, cmake, make and the like)
-# this does not include libraries that we need to compile different projects, we'd like
-# them in a different layer.
-RUN dnf install -y cmake \
- clang \
- lldb-devel \
- make \
- which && \
- dnf clean all
+FROM microsoft/dotnet-buildtools-prereqs:fedora23_prereqs
# Install tools used by the VSO build automation.
-RUN dnf install -y git \
- zip \
- tar \
- nodejs \
- findutils \
- npm && \
- dnf clean all && \
- npm install -g azure-cli && \
- npm cache clean
-
-# Dependencies of CoreCLR and CoreFX.
-RUN dnf install -y libicu-devel \
- libuuid-devel \
- libcurl-devel \
- openssl-devel \
- libunwind-devel \
- lttng-ust-devel && \
+RUN dnf install -y findutils && \
dnf clean all
# Upgrade NSS, used for SSL, to avoid NuGet restore timeouts.
diff --git a/scripts/docker/opensuse.13.2/Dockerfile b/scripts/docker/opensuse.13.2/Dockerfile
index 83244ea3c..c3cb77eb4 100644
--- a/scripts/docker/opensuse.13.2/Dockerfile
+++ b/scripts/docker/opensuse.13.2/Dockerfile
@@ -3,37 +3,11 @@
# Licensed under the MIT license. See LICENSE file in the project root for full license information.
#
-FROM opensuse:13.2
+FROM microsoft/dotnet-buildtools-prereqs:opensuse132_prereqs_v4
-# Install the base toolchain we need to build anything (clang, cmake, make and the like)
-# this does not include libraries that we need to compile different projects, we'd like
-# them in a different layer.
-RUN zypper -n install binutils \
- cmake \
- which \
- gcc \
- llvm-clang \
- tar \
- ncurses-utils \
- curl \
- git \
- sudo && \
- ln -s /usr/bin/clang++ /usr/bin/clang++-3.5 && \
+RUN zypper -n install sudo \
+ ncurses-utils && \
zypper clean -a
-
-# Dependencies of CoreCLR and CoreFX. We need to add an additional repository to get lttng.
-RUN zypper addrepo -G http://download.opensuse.org/repositories/devel:/tools:/lttng/openSUSE_13.2/devel:tools:lttng.repo && \
- zypper refresh && \
- zypper -n remove krb5-mini && \
- zypper -n install libunwind \
- libicu \
- lttng-ust \
- libuuid1 \
- libopenssl1_0_0 \
- libcurl4 \
- krb5 && \
- zypper clean -a
-
# Setup User to match Host User, and give superuser permissions
ARG USER_ID=0
RUN useradd -m code_executor -u ${USER_ID} -g wheel
diff --git a/scripts/obtain/uninstall/dotnet-uninstall-debian-packages.sh b/scripts/obtain/uninstall/dotnet-uninstall-debian-packages.sh
index 2fcd4280b..a62ce9ed4 100755
--- a/scripts/obtain/uninstall/dotnet-uninstall-debian-packages.sh
+++ b/scripts/obtain/uninstall/dotnet-uninstall-debian-packages.sh
@@ -13,8 +13,10 @@ if [ $current_userid -ne 0 ]; then
fi
host_package_name="dotnet-host"
+aspnetcore_package_store_package_name="^aspnetcore-store.*"
remove_all(){
+ apt-get purge -y $aspnetcore_package_store_package_name
apt-get purge -y $host_package_name
}
diff --git a/scripts/obtain/uninstall/dotnet-uninstall-rpm-packages.sh b/scripts/obtain/uninstall/dotnet-uninstall-rpm-packages.sh
index d3572ec38..ef7be91af 100755
--- a/scripts/obtain/uninstall/dotnet-uninstall-rpm-packages.sh
+++ b/scripts/obtain/uninstall/dotnet-uninstall-rpm-packages.sh
@@ -13,9 +13,11 @@ if [ $current_userid -ne 0 ]; then
fi
host_package_name="dotnet-host"
+aspnetcore_package_store_package_name="aspnetcore-store*"
remove_all(){
yum remove -y $host_package_name
+ yum remove -y $aspnetcore_package_store_package_name
}
is_dotnet_host_installed(){
diff --git a/src/Microsoft.DotNet.Archive/CompressionUtility.cs b/src/Microsoft.DotNet.Archive/CompressionUtility.cs
index 0b4e937dc..285799116 100644
--- a/src/Microsoft.DotNet.Archive/CompressionUtility.cs
+++ b/src/Microsoft.DotNet.Archive/CompressionUtility.cs
@@ -98,7 +98,7 @@ namespace Microsoft.DotNet.Archive
}
long compressedSize = inStream.Length - inStream.Position;
- var lzmaProgress = new LzmaProgress(progress, "Decompressing", outSize, MeasureBy.Output);
+ var lzmaProgress = new LzmaProgress(progress, LocalizableStrings.Decompressing, outSize, MeasureBy.Output);
lzmaProgress.SetProgress(0, 0);
decoder.Code(inStream, outStream, compressedSize, outSize, lzmaProgress);
lzmaProgress.SetProgress(inStream.Length, outSize);
diff --git a/src/Microsoft.DotNet.Archive/IndexedArchive.cs b/src/Microsoft.DotNet.Archive/IndexedArchive.cs
index bb4c9bbd1..fb0ef22f6 100644
--- a/src/Microsoft.DotNet.Archive/IndexedArchive.cs
+++ b/src/Microsoft.DotNet.Archive/IndexedArchive.cs
@@ -380,7 +380,7 @@ namespace Microsoft.DotNet.Archive
extractOperations.AsParallel().ForAll(extractOperation =>
{
extractOperation.DoOperation();
- progress.Report("Expanding", Interlocked.Increment(ref opsExecuted), extractOperations.Count);
+ progress.Report(LocalizableStrings.Expanding, Interlocked.Increment(ref opsExecuted), extractOperations.Count);
});
}
}
diff --git a/src/Microsoft.DotNet.Archive/LocalizableStrings.resx b/src/Microsoft.DotNet.Archive/LocalizableStrings.resx
new file mode 100644
index 000000000..9f9b5a9e7
--- /dev/null
+++ b/src/Microsoft.DotNet.Archive/LocalizableStrings.resx
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ Expanding
+
+
+ Decompressing
+
+
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.csproj b/src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.csproj
index 9a2cd2cdf..04b8f25be 100644
--- a/src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.csproj
+++ b/src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.csproj
@@ -10,8 +10,13 @@
true
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.cs.xlf b/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.cs.xlf
new file mode 100644
index 000000000..c73270522
--- /dev/null
+++ b/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.cs.xlf
@@ -0,0 +1,17 @@
+
+
+
+
+
+ Expanding
+ Expanding
+
+
+
+ Decompressing
+ Decompressing
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.de.xlf b/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.de.xlf
new file mode 100644
index 000000000..96d5d68ca
--- /dev/null
+++ b/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.de.xlf
@@ -0,0 +1,17 @@
+
+
+
+
+
+ Expanding
+ Expanding
+
+
+
+ Decompressing
+ Decompressing
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.es.xlf b/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.es.xlf
new file mode 100644
index 000000000..926da184e
--- /dev/null
+++ b/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.es.xlf
@@ -0,0 +1,17 @@
+
+
+
+
+
+ Expanding
+ Expanding
+
+
+
+ Decompressing
+ Decompressing
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.fr.xlf b/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.fr.xlf
new file mode 100644
index 000000000..5524d9821
--- /dev/null
+++ b/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.fr.xlf
@@ -0,0 +1,17 @@
+
+
+
+
+
+ Expanding
+ Expanding
+
+
+
+ Decompressing
+ Decompressing
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.it.xlf b/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.it.xlf
new file mode 100644
index 000000000..6c1c15533
--- /dev/null
+++ b/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.it.xlf
@@ -0,0 +1,17 @@
+
+
+
+
+
+ Expanding
+ Expanding
+
+
+
+ Decompressing
+ Decompressing
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.ja.xlf b/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.ja.xlf
new file mode 100644
index 000000000..e00b949fb
--- /dev/null
+++ b/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.ja.xlf
@@ -0,0 +1,17 @@
+
+
+
+
+
+ Expanding
+ Expanding
+
+
+
+ Decompressing
+ Decompressing
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.ko.xlf b/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.ko.xlf
new file mode 100644
index 000000000..fb515905d
--- /dev/null
+++ b/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.ko.xlf
@@ -0,0 +1,17 @@
+
+
+
+
+
+ Expanding
+ Expanding
+
+
+
+ Decompressing
+ Decompressing
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.pl.xlf b/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.pl.xlf
new file mode 100644
index 000000000..bfe8b9a35
--- /dev/null
+++ b/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.pl.xlf
@@ -0,0 +1,17 @@
+
+
+
+
+
+ Expanding
+ Expanding
+
+
+
+ Decompressing
+ Decompressing
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.pt-BR.xlf b/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.pt-BR.xlf
new file mode 100644
index 000000000..9e6cb642c
--- /dev/null
+++ b/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.pt-BR.xlf
@@ -0,0 +1,17 @@
+
+
+
+
+
+ Expanding
+ Expanding
+
+
+
+ Decompressing
+ Decompressing
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.ru.xlf b/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.ru.xlf
new file mode 100644
index 000000000..c09a74f61
--- /dev/null
+++ b/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.ru.xlf
@@ -0,0 +1,17 @@
+
+
+
+
+
+ Expanding
+ Expanding
+
+
+
+ Decompressing
+ Decompressing
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.tr.xlf b/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.tr.xlf
new file mode 100644
index 000000000..8be3dbe6a
--- /dev/null
+++ b/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.tr.xlf
@@ -0,0 +1,17 @@
+
+
+
+
+
+ Expanding
+ Expanding
+
+
+
+ Decompressing
+ Decompressing
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.zh-Hans.xlf b/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.zh-Hans.xlf
new file mode 100644
index 000000000..aab479ac3
--- /dev/null
+++ b/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.zh-Hans.xlf
@@ -0,0 +1,17 @@
+
+
+
+
+
+ Expanding
+ Expanding
+
+
+
+ Decompressing
+ Decompressing
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.zh-Hant.xlf b/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.zh-Hant.xlf
new file mode 100644
index 000000000..a333565e1
--- /dev/null
+++ b/src/Microsoft.DotNet.Archive/xlf/LocalizableStrings.zh-Hant.xlf
@@ -0,0 +1,17 @@
+
+
+
+
+
+ Expanding
+ Expanding
+
+
+
+ Decompressing
+ Decompressing
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.it.xlf b/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.it.xlf
index 85771b494..a19ec0313 100644
--- a/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.it.xlf
+++ b/src/Microsoft.DotNet.Cli.Sln.Internal/xlf/LocalizableStrings.it.xlf
@@ -39,7 +39,7 @@
Invalid format in line {0}: {1}
- Formato non valido a riga {0}: {1}
+ Formato non valido alla riga {0}: {1}
diff --git a/src/Microsoft.DotNet.Cli.Utils/Product.cs b/src/Microsoft.DotNet.Cli.Utils/Product.cs
index 023004ce4..8811847b3 100644
--- a/src/Microsoft.DotNet.Cli.Utils/Product.cs
+++ b/src/Microsoft.DotNet.Cli.Utils/Product.cs
@@ -7,7 +7,7 @@ namespace Microsoft.DotNet.Cli.Utils
{
public class Product
{
- public static readonly string LongName = LocalizableStrings.DotNetCommandLineTools;
+ public static string LongName => LocalizableStrings.DotNetCommandLineTools;
public static readonly string Version = GetProductVersion();
private static string GetProductVersion()
diff --git a/src/Microsoft.DotNet.Cli.Utils/RuntimeConfig.cs b/src/Microsoft.DotNet.Cli.Utils/RuntimeConfig.cs
index 61691e4a8..51574b3d5 100644
--- a/src/Microsoft.DotNet.Cli.Utils/RuntimeConfig.cs
+++ b/src/Microsoft.DotNet.Cli.Utils/RuntimeConfig.cs
@@ -15,7 +15,7 @@ namespace Microsoft.DotNet.Cli.Utils
public RuntimeConfig(string runtimeConfigPath)
{
JObject runtimeConfigJson;
- using (var streamReader = new StreamReader(new FileStream(runtimeConfigPath, FileMode.Open)))
+ using (var streamReader = new StreamReader(File.OpenRead(runtimeConfigPath)))
{
runtimeConfigJson = OpenRuntimeConfig(streamReader);
}
diff --git a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.cs.xlf b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.cs.xlf
index d72c9edf8..1aaef6cd5 100644
--- a/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.cs.xlf
+++ b/src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.cs.xlf
@@ -14,17 +14,17 @@
{0}: attempting to find command {1} in {2}
- {0}: pokus o nalezení příkazu {1} v {2}
+ {0}: Pokus o nalezení příkazu {1} v {2}
{0}: failed to find toolAssembly for {1}
- {0}: nepodařilo se najít toolAssembly pro {1}
+ {0}: Nepodařilo se najít toolAssembly pro {1}
{0}: failed to find commandPath {1}
- {0}: nepodařilo se najít commandPath {1}
+ {0}: Nepodařilo se najít commandPath {1}
@@ -121,7 +121,7 @@
{0}: attempting to create commandspec
- {0}: pokus o vytvoření specifikace příkazu commandspec
+ {0}: Pokus o vytvoření specifikace příkazu commandspec
@@ -131,7 +131,7 @@
{0}: expect deps.json at: {1}
- {0}: soubor deps.json se očekává v: {1}
+ {0}: Soubor deps.json se očekává v: {1}
@@ -206,7 +206,7 @@
< {0} exited with {1} in {2} ms.
- < {0} skončil s {1} ve {2} ms.
+ < {0} skončil s {1} za {2} ms.
@@ -231,7 +231,7 @@
The command executable for "{0}" was not found. The project may not have been restored or restore failed - run `dotnet restore`
- Spustitelný soubor příkazu {0} se nenašel. Projekt zřejmě nebyl obnoven, nebo obnovení selhalo – spusťte příkaz run `dotnet restore`.
+ Spustitelný soubor příkazu {0} se nenašel. Projekt se nepodařilo obnovit nebo jeho obnovení nebylo úspěšné. Spusťte příkaz dotnet restore.