diff --git a/TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj b/TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj index fb8b0c55c4d5..9aef91b8bb0d 100644 --- a/TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj +++ b/TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj @@ -14,7 +14,7 @@ - 1.0.0-alpha-20161102-2 + 1.0.0-alpha-20161104-2 All diff --git a/TestAssets/DesktopTestProjects/LibWithProjTool2Fx/Lib.csproj b/TestAssets/DesktopTestProjects/LibWithProjTool2Fx/Lib.csproj index caf26c4cd0af..2c9c4e149327 100644 --- a/TestAssets/DesktopTestProjects/LibWithProjTool2Fx/Lib.csproj +++ b/TestAssets/DesktopTestProjects/LibWithProjTool2Fx/Lib.csproj @@ -13,7 +13,7 @@ - 1.0.0-alpha-20161102-2 + 1.0.0-alpha-20161104-2 All diff --git a/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedPlatformDependency/TestProjectWithUnresolvedPlatformDependency.csproj b/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedPlatformDependency/TestProjectWithUnresolvedPlatformDependency.csproj index d68cfd7d05b6..7603ff8aeb39 100755 --- a/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedPlatformDependency/TestProjectWithUnresolvedPlatformDependency.csproj +++ b/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedPlatformDependency/TestProjectWithUnresolvedPlatformDependency.csproj @@ -13,7 +13,7 @@ - 1.0.0-alpha-20161102-2 + 1.0.0-alpha-20161104-2 All diff --git a/TestAssets/TestProjects/AppWithDepOnToolWithOutputName/AppWithDepOnToolWithOutputName.csproj b/TestAssets/TestProjects/AppWithDepOnToolWithOutputName/AppWithDepOnToolWithOutputName.csproj index a3166a05e197..2ff6718c8f2a 100755 --- a/TestAssets/TestProjects/AppWithDepOnToolWithOutputName/AppWithDepOnToolWithOutputName.csproj +++ b/TestAssets/TestProjects/AppWithDepOnToolWithOutputName/AppWithDepOnToolWithOutputName.csproj @@ -12,7 +12,7 @@ - 1.0.0-alpha-20161102-2 + 1.0.0-alpha-20161104-2 All diff --git a/TestAssets/TestProjects/AppWithDirectAndToolDep/AppWithDirectAndToolDep.csproj b/TestAssets/TestProjects/AppWithDirectAndToolDep/AppWithDirectAndToolDep.csproj index 92baa2eb6284..c15cded29f11 100755 --- a/TestAssets/TestProjects/AppWithDirectAndToolDep/AppWithDirectAndToolDep.csproj +++ b/TestAssets/TestProjects/AppWithDirectAndToolDep/AppWithDirectAndToolDep.csproj @@ -12,7 +12,7 @@ - 1.0.0-alpha-20161102-2 + 1.0.0-alpha-20161104-2 All diff --git a/TestAssets/TestProjects/AppWithDirectDep/AppWithDirectDep.csproj b/TestAssets/TestProjects/AppWithDirectDep/AppWithDirectDep.csproj index 9e85c61aff75..3f471245f857 100755 --- a/TestAssets/TestProjects/AppWithDirectDep/AppWithDirectDep.csproj +++ b/TestAssets/TestProjects/AppWithDirectDep/AppWithDirectDep.csproj @@ -21,7 +21,7 @@ - 1.0.0-alpha-20161102-2 + 1.0.0-alpha-20161104-2 All diff --git a/TestAssets/TestProjects/AppWithDirectDepWithOutputName/AppWithDirectDepWithOutputName.csproj b/TestAssets/TestProjects/AppWithDirectDepWithOutputName/AppWithDirectDepWithOutputName.csproj index af53f2b3ffc2..b6582f38a6e1 100755 --- a/TestAssets/TestProjects/AppWithDirectDepWithOutputName/AppWithDirectDepWithOutputName.csproj +++ b/TestAssets/TestProjects/AppWithDirectDepWithOutputName/AppWithDirectDepWithOutputName.csproj @@ -12,7 +12,7 @@ - 1.0.0-alpha-20161102-2 + 1.0.0-alpha-20161104-2 All diff --git a/TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj b/TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj index 35a9da8d87a0..77db60fd6e03 100644 --- a/TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj +++ b/TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj @@ -9,7 +9,7 @@ - 1.0.0-alpha-20161102-2 + 1.0.0-alpha-20161104-2 All diff --git a/TestAssets/TestProjects/AppWithToolDependency/AppWithToolDependency.csproj b/TestAssets/TestProjects/AppWithToolDependency/AppWithToolDependency.csproj index a572bde471c4..c5626e24253f 100755 --- a/TestAssets/TestProjects/AppWithToolDependency/AppWithToolDependency.csproj +++ b/TestAssets/TestProjects/AppWithToolDependency/AppWithToolDependency.csproj @@ -12,7 +12,7 @@ - 1.0.0-alpha-20161102-2 + 1.0.0-alpha-20161104-2 All diff --git a/TestAssets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj b/TestAssets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj index 93b4fc08526e..ebf2fb307fe9 100755 --- a/TestAssets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj +++ b/TestAssets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj @@ -14,7 +14,7 @@ - 1.0.0-alpha-20161102-2 + 1.0.0-alpha-20161104-2 All diff --git a/TestAssets/TestProjects/LibraryWithOutputAssemblyName/MyLibrary.csproj b/TestAssets/TestProjects/LibraryWithOutputAssemblyName/MyLibrary.csproj index 62c8d12835dc..9e037e07b09d 100755 --- a/TestAssets/TestProjects/LibraryWithOutputAssemblyName/MyLibrary.csproj +++ b/TestAssets/TestProjects/LibraryWithOutputAssemblyName/MyLibrary.csproj @@ -11,7 +11,7 @@ - 1.0.0-alpha-20161102-2 + 1.0.0-alpha-20161104-2 All diff --git a/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworks/MSBuildAppWithMultipleFrameworks.csproj b/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworks/MSBuildAppWithMultipleFrameworks.csproj index 4b0ede9b9de8..538c20c4062d 100644 --- a/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworks/MSBuildAppWithMultipleFrameworks.csproj +++ b/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworks/MSBuildAppWithMultipleFrameworks.csproj @@ -9,7 +9,7 @@ - 1.0.0-alpha-20161102-2 + 1.0.0-alpha-20161104-2 All diff --git a/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj b/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj index 35a9da8d87a0..77db60fd6e03 100644 --- a/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj +++ b/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj @@ -9,7 +9,7 @@ - 1.0.0-alpha-20161102-2 + 1.0.0-alpha-20161104-2 All diff --git a/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj b/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj index c23184de3d23..43b4a62b30fa 100644 --- a/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj +++ b/TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj @@ -16,7 +16,7 @@ 1.0.1 - 1.0.0-alpha-20161102-2 + 1.0.0-alpha-20161104-2 All diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary1/CsprojLibrary1.csproj b/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary1/CsprojLibrary1.csproj index a162d14f858f..2e6fc8754b7c 100644 --- a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary1/CsprojLibrary1.csproj +++ b/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary1/CsprojLibrary1.csproj @@ -14,7 +14,7 @@ - 1.0.0-alpha-20161102-2 + 1.0.0-alpha-20161104-2 All diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary1/project.json b/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary1/project.json index 2e1f9187e3d4..bc57c51ffbb1 100644 --- a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary1/project.json +++ b/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary1/project.json @@ -3,7 +3,7 @@ "frameworks": { "netstandard1.5": { "dependencies": { - "Microsoft.NET.Sdk": "1.0.0-alpha-20161102-2", + "Microsoft.NET.Sdk": "1.0.0-alpha-20161104-2", "NETStandard.Library": "1.6.0" } } diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary2/CsprojLibrary2.csproj b/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary2/CsprojLibrary2.csproj index a162d14f858f..2e6fc8754b7c 100644 --- a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary2/CsprojLibrary2.csproj +++ b/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary2/CsprojLibrary2.csproj @@ -14,7 +14,7 @@ - 1.0.0-alpha-20161102-2 + 1.0.0-alpha-20161104-2 All diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary2/project.json b/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary2/project.json index 2e1f9187e3d4..bc57c51ffbb1 100644 --- a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary2/project.json +++ b/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary2/project.json @@ -3,7 +3,7 @@ "frameworks": { "netstandard1.5": { "dependencies": { - "Microsoft.NET.Sdk": "1.0.0-alpha-20161102-2", + "Microsoft.NET.Sdk": "1.0.0-alpha-20161104-2", "NETStandard.Library": "1.6.0" } } diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary3/CsprojLibrary3.csproj b/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary3/CsprojLibrary3.csproj index a162d14f858f..2e6fc8754b7c 100644 --- a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary3/CsprojLibrary3.csproj +++ b/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary3/CsprojLibrary3.csproj @@ -14,7 +14,7 @@ - 1.0.0-alpha-20161102-2 + 1.0.0-alpha-20161104-2 All diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary3/project.json b/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary3/project.json index 2e1f9187e3d4..bc57c51ffbb1 100644 --- a/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary3/project.json +++ b/TestAssets/TestProjects/TestAppDependencyGraph/CsprojLibrary3/project.json @@ -3,7 +3,7 @@ "frameworks": { "netstandard1.5": { "dependencies": { - "Microsoft.NET.Sdk": "1.0.0-alpha-20161102-2", + "Microsoft.NET.Sdk": "1.0.0-alpha-20161104-2", "NETStandard.Library": "1.6.0" } } diff --git a/TestAssets/TestProjects/TestAppSimple/TestAppSimple.csproj b/TestAssets/TestProjects/TestAppSimple/TestAppSimple.csproj index b9e110f9be42..b219a33d2743 100755 --- a/TestAssets/TestProjects/TestAppSimple/TestAppSimple.csproj +++ b/TestAssets/TestProjects/TestAppSimple/TestAppSimple.csproj @@ -12,7 +12,7 @@ - 1.0.0-alpha-20161102-2 + 1.0.0-alpha-20161104-2 All diff --git a/TestAssets/TestProjects/TestAppWithProjDepTool/TestAppWithProjDepTool.csproj b/TestAssets/TestProjects/TestAppWithProjDepTool/TestAppWithProjDepTool.csproj index e558a21e0b01..560350cc6580 100644 --- a/TestAssets/TestProjects/TestAppWithProjDepTool/TestAppWithProjDepTool.csproj +++ b/TestAssets/TestProjects/TestAppWithProjDepTool/TestAppWithProjDepTool.csproj @@ -15,7 +15,7 @@ 1.0.1 - 1.0.0-alpha-20161102-2 + 1.0.0-alpha-20161104-2 All diff --git a/TestAssets/TestProjects/TestLibraryWithConfiguration/TestLibraryWithConfiguration.csproj b/TestAssets/TestProjects/TestLibraryWithConfiguration/TestLibraryWithConfiguration.csproj index 81fbddda7206..46fe4b78b4c9 100755 --- a/TestAssets/TestProjects/TestLibraryWithConfiguration/TestLibraryWithConfiguration.csproj +++ b/TestAssets/TestProjects/TestLibraryWithConfiguration/TestLibraryWithConfiguration.csproj @@ -5,7 +5,6 @@ netstandard1.5 $(NoWarn);CS1591 true - $(OutputPath)\$(TargetFramework)\$(AssemblyName).xml @@ -14,7 +13,7 @@ - 1.0.0-alpha-20161102-2 + 1.0.0-alpha-20161104-2 All diff --git a/TestAssets/TestProjects/VSTestDesktopAndNetCore/VSTestDesktopAndNetCore.csproj b/TestAssets/TestProjects/VSTestDesktopAndNetCore/VSTestDesktopAndNetCore.csproj index e37ec73043d8..4758dc3b24af 100644 --- a/TestAssets/TestProjects/VSTestDesktopAndNetCore/VSTestDesktopAndNetCore.csproj +++ b/TestAssets/TestProjects/VSTestDesktopAndNetCore/VSTestDesktopAndNetCore.csproj @@ -22,7 +22,7 @@ - 1.0.0-alpha-20161102-2 + 1.0.0-alpha-20161104-2 All diff --git a/TestAssets/TestProjects/VSTestDotNetCore/VSTestDotNetCore.csproj b/TestAssets/TestProjects/VSTestDotNetCore/VSTestDotNetCore.csproj index 96d4a69c6b0f..db9d8f51a56e 100644 --- a/TestAssets/TestProjects/VSTestDotNetCore/VSTestDotNetCore.csproj +++ b/TestAssets/TestProjects/VSTestDotNetCore/VSTestDotNetCore.csproj @@ -15,7 +15,7 @@ 1.0.1 - 1.0.0-alpha-20161102-2 + 1.0.0-alpha-20161104-2 All diff --git a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj index 7471a645c383..03bbb7670950 100644 --- a/build_projects/dotnet-cli-build/dotnet-cli-build.csproj +++ b/build_projects/dotnet-cli-build/dotnet-cli-build.csproj @@ -43,7 +43,7 @@ 1.0.1-beta-000933 - 1.0.0-alpha-20161102-2 + 1.0.0-alpha-20161104-2 All diff --git a/src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.csproj b/src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.csproj index d1d369edf455..f5c211dff572 100644 --- a/src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.csproj +++ b/src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.csproj @@ -13,7 +13,7 @@ - 1.0.0-alpha-20161102-2 + 1.0.0-alpha-20161104-2 All diff --git a/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj b/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj index d948009f0855..a3170b6f4838 100644 --- a/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj +++ b/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj @@ -14,7 +14,7 @@ - 1.0.0-alpha-20161102-2 + 1.0.0-alpha-20161104-2 All diff --git a/src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj b/src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj index 78f7c267c35e..9a2e95ac44e3 100644 --- a/src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj +++ b/src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj @@ -21,7 +21,7 @@ - 1.0.0-alpha-20161102-2 + 1.0.0-alpha-20161104-2 All diff --git a/src/Microsoft.DotNet.InternalAbstractions/Microsoft.DotNet.InternalAbstractions.csproj b/src/Microsoft.DotNet.InternalAbstractions/Microsoft.DotNet.InternalAbstractions.csproj index 169e8d8cf3b7..ba5c20ee8d44 100644 --- a/src/Microsoft.DotNet.InternalAbstractions/Microsoft.DotNet.InternalAbstractions.csproj +++ b/src/Microsoft.DotNet.InternalAbstractions/Microsoft.DotNet.InternalAbstractions.csproj @@ -20,7 +20,7 @@ 1.6.0 - 1.0.0-alpha-20161102-2 + 1.0.0-alpha-20161104-2 All diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.ProjectJsonMigration.csproj b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.ProjectJsonMigration.csproj index db1a63da02cf..515e2144ff7f 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.ProjectJsonMigration.csproj +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Microsoft.DotNet.ProjectJsonMigration.csproj @@ -17,7 +17,7 @@ - 1.0.0-alpha-20161102-2 + 1.0.0-alpha-20161104-2 All diff --git a/src/Microsoft.DotNet.ProjectJsonMigration/Rules/MigrateBuildOptionsRule.cs b/src/Microsoft.DotNet.ProjectJsonMigration/Rules/MigrateBuildOptionsRule.cs index d0160a2238b4..3648337093b8 100644 --- a/src/Microsoft.DotNet.ProjectJsonMigration/Rules/MigrateBuildOptionsRule.cs +++ b/src/Microsoft.DotNet.ProjectJsonMigration/Rules/MigrateBuildOptionsRule.cs @@ -96,13 +96,7 @@ private AddPropertyTransform[] KeyFileTransforms private AddPropertyTransform XmlDocTransform => new AddPropertyTransform("GenerateDocumentationFile", compilerOptions => compilerOptions.GenerateXmlDocumentation.ToString().ToLower(), - compilerOptions => compilerOptions.GenerateXmlDocumentation != null && compilerOptions.GenerateXmlDocumentation.Value); - - // TODO: https://github.com/dotnet/sdk/issues/67 - private AddPropertyTransform XmlDocTransformFilePath => - new AddPropertyTransform("DocumentationFile", - @"$(OutputPath)\$(TargetFramework)\$(AssemblyName).xml", - compilerOptions => compilerOptions.GenerateXmlDocumentation != null && compilerOptions.GenerateXmlDocumentation.Value); + compilerOptions => compilerOptions.GenerateXmlDocumentation != null && compilerOptions.GenerateXmlDocumentation.Value); private AddPropertyTransform AssemblyNameTransform => new AddPropertyTransform("AssemblyName", @@ -177,7 +171,6 @@ private void ConstructTransformLists() PublicSignTransform, DebugTypeTransform, XmlDocTransform, - XmlDocTransformFilePath, PreserveCompilationContextTransform, AssemblyNameTransform }; diff --git a/src/Microsoft.DotNet.TestFramework/Microsoft.DotNet.TestFramework.csproj b/src/Microsoft.DotNet.TestFramework/Microsoft.DotNet.TestFramework.csproj index 035db8a87e7b..f029b866b728 100644 --- a/src/Microsoft.DotNet.TestFramework/Microsoft.DotNet.TestFramework.csproj +++ b/src/Microsoft.DotNet.TestFramework/Microsoft.DotNet.TestFramework.csproj @@ -17,7 +17,7 @@ - 1.0.0-alpha-20161102-2 + 1.0.0-alpha-20161104-2 All diff --git a/src/dotnet-archive/dotnet-archive.csproj b/src/dotnet-archive/dotnet-archive.csproj index 9777e0ec304a..d1279addd2d2 100644 --- a/src/dotnet-archive/dotnet-archive.csproj +++ b/src/dotnet-archive/dotnet-archive.csproj @@ -13,7 +13,7 @@ - 1.0.0-alpha-20161102-2 + 1.0.0-alpha-20161104-2 All diff --git a/src/dotnet/commands/dotnet-new/CSharp_Console/$projectName$.csproj b/src/dotnet/commands/dotnet-new/CSharp_Console/$projectName$.csproj index c068b8a13735..82c832ae4676 100755 --- a/src/dotnet/commands/dotnet-new/CSharp_Console/$projectName$.csproj +++ b/src/dotnet/commands/dotnet-new/CSharp_Console/$projectName$.csproj @@ -16,7 +16,7 @@ 1.0.1 - 1.0.0-alpha-20161102-2 + 1.0.0-alpha-20161104-2 All diff --git a/src/dotnet/commands/dotnet-new/CSharp_Lib/$projectName$.csproj b/src/dotnet/commands/dotnet-new/CSharp_Lib/$projectName$.csproj index 28831340e2cc..d5b1508de0f9 100755 --- a/src/dotnet/commands/dotnet-new/CSharp_Lib/$projectName$.csproj +++ b/src/dotnet/commands/dotnet-new/CSharp_Lib/$projectName$.csproj @@ -15,7 +15,7 @@ 1.6 - 1.0.0-alpha-20161102-2 + 1.0.0-alpha-20161104-2 All diff --git a/src/dotnet/commands/dotnet-new/CSharp_Mstest/$projectName$.csproj b/src/dotnet/commands/dotnet-new/CSharp_Mstest/$projectName$.csproj index 29b4af4dd1c2..83514f920e3a 100644 --- a/src/dotnet/commands/dotnet-new/CSharp_Mstest/$projectName$.csproj +++ b/src/dotnet/commands/dotnet-new/CSharp_Mstest/$projectName$.csproj @@ -16,7 +16,7 @@ 1.0.1 - 1.0.0-alpha-20161102-1 + 1.0.0-alpha-20161104-2 All diff --git a/src/dotnet/commands/dotnet-new/CSharp_Web/$projectName$.csproj b/src/dotnet/commands/dotnet-new/CSharp_Web/$projectName$.csproj index 9d6385cb1d37..26cf9eddfa03 100644 --- a/src/dotnet/commands/dotnet-new/CSharp_Web/$projectName$.csproj +++ b/src/dotnet/commands/dotnet-new/CSharp_Web/$projectName$.csproj @@ -21,7 +21,7 @@ 1.0.1 - 1.0.0-alpha-20161102-2-100 + 1.0.0-alpha-20161104-2-112 1.0.0 diff --git a/src/dotnet/commands/dotnet-new/CSharp_Xunittest/$projectName$.csproj b/src/dotnet/commands/dotnet-new/CSharp_Xunittest/$projectName$.csproj index 560e73d66073..61848a27e9f7 100644 --- a/src/dotnet/commands/dotnet-new/CSharp_Xunittest/$projectName$.csproj +++ b/src/dotnet/commands/dotnet-new/CSharp_Xunittest/$projectName$.csproj @@ -16,7 +16,7 @@ 1.0.1 - 1.0.0-alpha-20161102-2 + 1.0.0-alpha-20161104-2 All diff --git a/src/dotnet/dotnet.csproj b/src/dotnet/dotnet.csproj index 744923fee5e0..830a008989ae 100755 --- a/src/dotnet/dotnet.csproj +++ b/src/dotnet/dotnet.csproj @@ -28,7 +28,7 @@ - 1.0.0-alpha-20161102-2 + 1.0.0-alpha-20161104-2 All diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index ae99e22b22d3..2ff71b9d8129 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -14,7 +14,7 @@ - 1.0.0-alpha-20161102-2 + 1.0.0-alpha-20161104-2 All diff --git a/src/tool_csc/tool_csc.csproj b/src/tool_csc/tool_csc.csproj index 5b14428f4cb5..a993f6600982 100644 --- a/src/tool_csc/tool_csc.csproj +++ b/src/tool_csc/tool_csc.csproj @@ -7,7 +7,7 @@ - 1.0.0-alpha-20161102-2 + 1.0.0-alpha-20161104-2 All diff --git a/src/tool_msbuild/tool_msbuild.csproj b/src/tool_msbuild/tool_msbuild.csproj index 0ab29e7a597b..11a54dd7af0d 100644 --- a/src/tool_msbuild/tool_msbuild.csproj +++ b/src/tool_msbuild/tool_msbuild.csproj @@ -7,7 +7,7 @@ - 1.0.0-alpha-20161102-2 + 1.0.0-alpha-20161104-2 All diff --git a/src/tool_nuget/tool_nuget.csproj b/src/tool_nuget/tool_nuget.csproj index 3b408837eb2d..2f51adcf86e7 100644 --- a/src/tool_nuget/tool_nuget.csproj +++ b/src/tool_nuget/tool_nuget.csproj @@ -6,7 +6,7 @@ - 1.0.0-alpha-20161102-2 + 1.0.0-alpha-20161104-2 All diff --git a/test/dotnet-pack.Tests/PackTests.cs b/test/dotnet-pack.Tests/PackTests.cs index bf48f42aacb0..3c209d021b41 100644 --- a/test/dotnet-pack.Tests/PackTests.cs +++ b/test/dotnet-pack.Tests/PackTests.cs @@ -90,9 +90,8 @@ public void SettingVersionSuffixFlag_ShouldStampAssemblyInfoInOutputAssemblyAndP informationalVersion.Should().NotBeNull() .And.BeEquivalentTo("1.0.0-85"); - // netstandard1.5 is a workaround for https://github.com/dotnet/sdk/issues/318 var outputPackage = testInstance.Root - .GetDirectory("bin", "Debug", "netstandard1.5") + .GetDirectory("bin", "Debug") .GetFile("TestLibraryWithConfiguration.1.0.0-85.nupkg"); outputPackage.Should().Exist(); @@ -191,8 +190,7 @@ public void HasServiceableFlagWhenArgumentPassed() result.Should().Pass(); - // netstandard1.5 is a workaround for https://github.com/dotnet/sdk/issues/318 - var outputDir = testInstance.Root.GetDirectory("bin", "Debug", "netstandard1.5"); + var outputDir = testInstance.Root.GetDirectory("bin", "Debug"); outputDir.Should().Exist() .And.HaveFile("TestLibraryWithConfiguration.1.0.0.nupkg"); diff --git a/tools/Archiver/Archiver.csproj b/tools/Archiver/Archiver.csproj index 75b53486aff9..2d8339bd8a68 100644 --- a/tools/Archiver/Archiver.csproj +++ b/tools/Archiver/Archiver.csproj @@ -14,7 +14,7 @@ - 1.0.0-alpha-20161102-2 + 1.0.0-alpha-20161104-2 All diff --git a/tools/MigrationDefaultsConstructor/MigrationDefaultsConstructor.csproj b/tools/MigrationDefaultsConstructor/MigrationDefaultsConstructor.csproj index a735ba235ffe..033746538880 100644 --- a/tools/MigrationDefaultsConstructor/MigrationDefaultsConstructor.csproj +++ b/tools/MigrationDefaultsConstructor/MigrationDefaultsConstructor.csproj @@ -20,7 +20,7 @@ - 1.0.0-alpha-20161102-2 + 1.0.0-alpha-20161104-2 All