diff --git a/.gitignore b/.gitignore index ba949609e0..4053f67f62 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ msbuild.ProjectImports.zip scripts/tmp/ .dotnet/ .tools/ +src/**/global.json diff --git a/build/Publish.targets b/build/Publish.targets index a3493b3933..e21a3f33b7 100644 --- a/build/Publish.targets +++ b/build/Publish.targets @@ -64,7 +64,6 @@ aspnetcore/npm/ aspnetcore/jar/ aspnetcore/Runtime/$(SharedFxCliBlobChannel)/ - runtime-site-extension-internal-$(PackageVersion).zip aspnetcore-runtime-$(PackageVersion) aspnetcore-runtime-latest aspnetcore-runtime-internal-$(PackageVersion) @@ -95,11 +94,6 @@ - - $(BlobBasePath)$(SiteExtensionArchiveFileName) - ShipInstaller=dotnetcli - - $(BlobBasePath)nuGetPackagesArchive-$(PackageVersion).lzma ShipInstaller=dotnetcli diff --git a/src/IISIntegration/Directory.Build.props b/src/IISIntegration/Directory.Build.props index 45a38d3e61..7c0a39562a 100644 --- a/src/IISIntegration/Directory.Build.props +++ b/src/IISIntegration/Directory.Build.props @@ -1,20 +1,11 @@  - + + - - Microsoft ASP.NET Core - https://github.com/aspnet/IISIntegration - git - $(MSBuildThisFileDirectory) - $(MSBuildThisFileDirectory)build\Key.snk - true - true false diff --git a/src/IISIntegration/IISIntegration.NoV1.sln b/src/IISIntegration/IISIntegration.NoV1.sln index f7eb135f73..e0e3d4967e 100644 --- a/src/IISIntegration/IISIntegration.NoV1.sln +++ b/src/IISIntegration/IISIntegration.NoV1.sln @@ -45,7 +45,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{7E80C58E build\native.targets = build\native.targets build\repo.props = build\repo.props build\repo.targets = build\repo.targets - build\sources.props = build\sources.props build\testsite.props = build\testsite.props EndProjectSection EndProject diff --git a/src/IISIntegration/IISIntegration.sln b/src/IISIntegration/IISIntegration.sln index 440001a8ac..74e2591646 100644 --- a/src/IISIntegration/IISIntegration.sln +++ b/src/IISIntegration/IISIntegration.sln @@ -46,7 +46,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{7E80C58E build\native.targets = build\native.targets build\repo.props = build\repo.props build\repo.targets = build\repo.targets - build\sources.props = build\sources.props build\testsite.props = build\testsite.props EndProjectSection EndProject diff --git a/src/IISIntegration/build/repo.props b/src/IISIntegration/build/repo.props index 6a94ca900f..b75afd2b3c 100644 --- a/src/IISIntegration/build/repo.props +++ b/src/IISIntegration/build/repo.props @@ -2,7 +2,6 @@ - $(BuildDir)AspNetCoreModule.zip $(BuildDir)StressTestWebSite.zip diff --git a/src/IISIntegration/build/repo.targets b/src/IISIntegration/build/repo.targets index 51fae5d588..66bd375737 100644 --- a/src/IISIntegration/build/repo.targets +++ b/src/IISIntegration/build/repo.targets @@ -4,7 +4,7 @@ $(PrepareDependsOn) $(GetArtifactInfoDependsOn);GetNativeArtifactsInfo BuildNativeAssets;$(CompileDependsOn) - $(PackageDependsOn);PackageNativeProjects;PackageStressTestApp + $(PackageDependsOn);PackageNativeProjects $(TestDependsOn);RunNativeTest $(RepositoryRoot)NuGetPackageVerifier.xplat.json $(RepositoryRoot)src\ diff --git a/src/IISIntegration/build/sources.props b/src/IISIntegration/build/sources.props deleted file mode 100644 index 9215df9751..0000000000 --- a/src/IISIntegration/build/sources.props +++ /dev/null @@ -1,17 +0,0 @@ - - - - - $(DotNetRestoreSources) - - $(RestoreSources); - https://dotnet.myget.org/F/dotnet-core/api/v3/index.json; - https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json; - https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json; - - - $(RestoreSources); - https://api.nuget.org/v3/index.json; - - -