Explorar o código

Fixing source link

Tigger Kindel hai 1 ano
pai
achega
f55c4e66ca

+ 2 - 2
Example/Example.csproj

@@ -7,8 +7,8 @@
     <!-- Do not modify these. -->
     <AssemblyVersion>1.14.0.0</AssemblyVersion>
     <FileVersion>1.14.0.0</FileVersion>
-    <Version>1.14.0-v1-develop-branc0114</Version>
-    <InformationalVersion>1.14.0-v1-develop-branching-update.114+Branch.v1-develop-branching-update.Sha.da42a3c595a0e7146db50be7001215a563e857b3</InformationalVersion>
+    <Version>1.14.0-v1-develop-branc0115</Version>
+    <InformationalVersion>1.14.0-v1-develop-branching-update.115+Branch.v1-develop-branching-update.Sha.196872f2340046682a9fc98bceba4894e866e1c5</InformationalVersion>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Terminal.Gui\Terminal.Gui.csproj" />

+ 2 - 2
FSharpExample/FSharpExample.fsproj

@@ -4,8 +4,8 @@
     <TargetFramework>net6.0</TargetFramework>
     <AssemblyVersion>1.14.0.0</AssemblyVersion>
     <FileVersion>1.14.0.0</FileVersion>
-    <InformationalVersion>1.14.0-v1-develop-branching-update.114+Branch.v1-develop-branching-update.Sha.da42a3c595a0e7146db50be7001215a563e857b3</InformationalVersion>
-    <Version>1.14.0-v1-develop-branc0114</Version>
+    <InformationalVersion>1.14.0-v1-develop-branching-update.115+Branch.v1-develop-branching-update.Sha.196872f2340046682a9fc98bceba4894e866e1c5</InformationalVersion>
+    <Version>1.14.0-v1-develop-branc0115</Version>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Program.fs" />

+ 2 - 2
ReactiveExample/ReactiveExample.csproj

@@ -7,8 +7,8 @@
     <!-- Do not modify these. -->
     <AssemblyVersion>1.14.0.0</AssemblyVersion>
     <FileVersion>1.14.0.0</FileVersion>
-    <Version>1.14.0-v1-develop-branc0114</Version>
-    <InformationalVersion>1.14.0-v1-develop-branching-update.114+Branch.v1-develop-branching-update.Sha.da42a3c595a0e7146db50be7001215a563e857b3</InformationalVersion>
+    <Version>1.14.0-v1-develop-branc0115</Version>
+    <InformationalVersion>1.14.0-v1-develop-branching-update.115+Branch.v1-develop-branching-update.Sha.196872f2340046682a9fc98bceba4894e866e1c5</InformationalVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="ReactiveUI.Fody" Version="19.4.1" />

+ 11 - 10
Terminal.Gui/Terminal.Gui.csproj

@@ -5,13 +5,11 @@
   <!-- GitVersion.xml controls settings  -->
   <!-- =================================================================== -->
   <PropertyGroup>
-    <VersionPrefix>1.14.0</VersionPrefix>
-    <VersionSuffix>pre.$([System.DateTime]::UtcNow.ToString("yyyyMMdd.HHmm"))</VersionSuffix>
     <AssemblyVersion>1.14.0.0</AssemblyVersion>
     <FileVersion>1.14.0.0</FileVersion>
-    <InformationalVersion>1.14.0-v1-develop-branching-update.114+Branch.v1-develop-branching-update.Sha.da42a3c595a0e7146db50be7001215a563e857b3</InformationalVersion>
+    <InformationalVersion>1.14.0-v1-develop-branching-update.115+Branch.v1-develop-branching-update.Sha.196872f2340046682a9fc98bceba4894e866e1c5</InformationalVersion>
     <PackageVersion>$(Version)</PackageVersion>
-    <Version>1.14.0-v1-develop-branc0114</Version>
+    <Version>1.14.0-v1-develop-branc0115</Version>
   </PropertyGroup>
   <!-- =================================================================== -->
   <!-- Enables printing of version info after build -->
@@ -34,16 +32,20 @@
     <TargetFrameworks>net472;netstandard2.1;net7.0</TargetFrameworks>
     <RootNamespace>Terminal.Gui</RootNamespace>
     <AssemblyName>Terminal.Gui</AssemblyName>
+    <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
   </PropertyGroup>
   <!-- =================================================================== -->
   <!-- Dependencies -->
   <!-- =================================================================== -->
   <ItemGroup>
     <PackageReference Include="NStack.Core" Version="1.0.7" />
+    <PackageReference Include="System.Management" Version="7.0.2" />
+    <!-- Enable Nuget Source Link for github -->
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
     <InternalsVisibleTo Include="UnitTests" />
   </ItemGroup>
-  <!-- Uncomment the RestoreSources element to have dotnet restore pull NStack from a local dir for testing -->
   <PropertyGroup>
+    <!-- Uncomment the RestoreSources element to have dotnet restore pull NStack from a local dir for testing -->
     <!-- See https://stackoverflow.com/a/44463578/297526 -->
     <!--<RestoreSources>$(RestoreSources);..\..\NStack\NStack\bin\Debug;https://api.nuget.org/v3/index.json</RestoreSources>-->
   </PropertyGroup>
@@ -103,11 +105,10 @@
     <!-- Publish the repository URL in the built .nupkg (in the NuSpec <Repository> element) -->
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <!-- Embed source files that are not tracked by the source control manager in the PDB -->
+    <GitRepositoryRemoteName>upstream</GitRepositoryRemoteName>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <EnableSourceLink>true</EnableSourceLink>
+    <DebugType>Embedded</DebugType>
+    <Authors>Miguel de Icaza, Tig Kindel (@tig), @BDisp</Authors>
   </PropertyGroup>
-  <ItemGroup>
-    <!-- Enable Nuget Source Link for github -->
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
-    <PackageReference Include="System.Management" Version="7.0.2" />
-  </ItemGroup>
 </Project>

+ 1 - 0
Terminal.sln

@@ -20,6 +20,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		CONTRIBUTING.md = CONTRIBUTING.md
 		.github\workflows\dotnet-core.yml = .github\workflows\dotnet-core.yml
 		GitVersion.yml = GitVersion.yml
+		global.json = global.json
 		.github\workflows\publish.yml = .github\workflows\publish.yml
 		README.md = README.md
 		testenvironments.json = testenvironments.json

+ 2 - 2
UICatalog/UICatalog.csproj

@@ -9,8 +9,8 @@
     <!-- Do not modify these. -->
     <AssemblyVersion>1.14.0.0</AssemblyVersion>
     <FileVersion>1.14.0.0</FileVersion>
-    <Version>1.14.0-v1-develop-branc0114</Version>
-    <InformationalVersion>1.14.0-v1-develop-branching-update.114+Branch.v1-develop-branching-update.Sha.da42a3c595a0e7146db50be7001215a563e857b3</InformationalVersion>
+    <Version>1.14.0-v1-develop-branc0115</Version>
+    <InformationalVersion>1.14.0-v1-develop-branching-update.115+Branch.v1-develop-branching-update.Sha.196872f2340046682a9fc98bceba4894e866e1c5</InformationalVersion>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">

+ 2 - 2
UnitTests/UnitTests.csproj

@@ -11,8 +11,8 @@
     <!-- Do not modify these. -->
     <AssemblyVersion>1.14.0.0</AssemblyVersion>
     <FileVersion>1.14.0.0</FileVersion>
-    <Version>1.14.0-v1-develop-branc0114</Version>
-    <InformationalVersion>1.14.0-v1-develop-branching-update.114+Branch.v1-develop-branching-update.Sha.da42a3c595a0e7146db50be7001215a563e857b3</InformationalVersion>
+    <Version>1.14.0-v1-develop-branc0115</Version>
+    <InformationalVersion>1.14.0-v1-develop-branching-update.115+Branch.v1-develop-branching-update.Sha.196872f2340046682a9fc98bceba4894e866e1c5</InformationalVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <DefineConstants>TRACE</DefineConstants>

+ 2 - 2
global.json

@@ -1,6 +1,6 @@
 {
   "sdk":{
-    "version":"7.0.100",
-    "rollForward":"latestMajor"
+    "version":"7.0.200",
+    "rollForward":"latestMinor"
   }
 }